From patchwork Thu Feb 23 06:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2684 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 23 Feb 2023 07:44:26 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31N6iQt0019165 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Feb 2023 07:44:26 +0100 Received: by mail-wm1-f63.google.com with SMTP id c7-20020a7bc847000000b003e00be23a70sf4670420wml.2; Wed, 22 Feb 2023 22:44:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677134661; cv=pass; d=google.com; s=arc-20160816; b=qe0rjevnxGtaBtgNGmptCWlXP40EvUgfNxUDPNj6vbYaMU0HtYVTjZ+iVs1nTlGWZr vGjHHMesUHpAojWDMpZWvmppyDI9ZWmSZf+4lj3aQMgqSIfKSFSEeD05KeR5EgxvUyAF W3g1L6BPR5JYmp9I1mlg2qyY/G4KAQdYOAphFe0M0YcvfSt10O+y1gqVqQmVVY6zmLra raXpE7GnLSELEwMkemdgYfGfNQrOdHpqIIL7wXu/Nfh0sv3BZlWIG5KCAZayfqqs34Bl GrCzo2YLUfLGFoLr1BaBMuF0T6ff8Abu6gc/c29OOiW+DM74qBsOyZmNbZbbLHQvBtFn r+2Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=1zDOT4Z+RGIQXzP9Pf88HL6Na43pZ86+mEOk0nWWbvE=; b=SizDDw20GYkt1f5yTSR9vpaz6hTEpBQQJGvfzY2uwtLl95ayZ7HKUk5WVUpBqNBZtz l88lr3HhPZu2oppMd/2uIt/fKqxmuVgCShyhAbzeEz9zdurMRAtU8iWcCVx4U5tnYjRo wlZ2ZRZjypDkM2RZEt4kdiXS0sA76cu/SGYovL20Gd/dXiY8O5OKSQUw0uiZhJppESTK D0zW+QI0eXWPf5V/UWglWH3IgpZ38i+5R4/QvZKoGaXg69jSdpu6HuTTQL8CQZvTGMXa Yj7yPxIDU8h73xntWI8K0L+eHE8gGjJQjZVl1HzSCb8opSP+wv4NVw6xv6pk+JOC/Be+ bRew== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=deciKifr; spf=pass (google.com: domain of fm-72506-202302230644192b5843bfc98ed0077b-teow11@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302230644192b5843bfc98ed0077b-TEow11@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=1zDOT4Z+RGIQXzP9Pf88HL6Na43pZ86+mEOk0nWWbvE=; b=Qjlk+ngSIxYRtZuQJfz5Wu8oouAYm5r5yDDbozdyNAWfcBbKAbNQ0xQhfRN8Jl8ddX kKyMWohbNBBQHiY5+53z9xDj2bbpWRSscXfu2/OnuHvbE6T+6gCyVz5hPjAyypyzY372 8vkEiCa25/2aTFqni7McnRPTCp198VxiY4xpYg3L26fflVCKCnyqky037NpxKmyxWnha eApsfwyjTqHQTMf8McRMEV0eMNqmKYEePFjvl2nYeCe/eqGLJ6zhoIdLZ+77DAG2Lhog Pi7lLExIemKCYA/tpTEWeFDUkl3+Jl++8s/GI3IBLKjLs1QDthFKaCS6CO1+pEeQkbO4 5HTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=1zDOT4Z+RGIQXzP9Pf88HL6Na43pZ86+mEOk0nWWbvE=; b=GN+fhc3j7JonrgUFUtWX7Ng/mOxDc81Qk9g9ZYogiDCJjCK05zpQJHPstY5Q0pSsnA 1axn2OwgIb0krKnP9QNNMU65kNn7cUa0HraUdkPtDmNL63l4ftp4Vu7/ZTVvAX/7QJr2 eCufganTr+5jvUl1W/hONBm1g/pU7EQLrqpzf4+C/YAtOgrGFBaZhgRoYfr0E4jZ25V7 nd7nt9URht5mZ320vjy0h+xxI3apQJpgtsahZvD5IhEavQNoUhbahL4i2pKtLZOr5BbS GCaO3Ta6oqoH5qXDk6rFBZEQKA2qUvYL2fRIB3py3QwAe9Dv1uJD5FKIBJ0liUcW91kn mQsA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXs01qgVvj795VuCGIbiRKVy991aujbP1GPjEAPnSPMTq2o2cO3 dLhRpUVZlDsVXWiuUKCO+D4= X-Google-Smtp-Source: AK7set/VsqOdArjqfsixSA5/xNOGjDEX17PwR/6lhjUlmhD1c7TZ2RlIHdF5yCD3wRvrKgkXd5YdWA== X-Received: by 2002:a5d:6410:0:b0:2c5:8377:3eaf with SMTP id z16-20020a5d6410000000b002c583773eafmr469734wru.2.1677134660848; Wed, 22 Feb 2023 22:44:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b04:b0:3cf:72dc:df8 with SMTP id m4-20020a05600c3b0400b003cf72dc0df8ls1748407wms.0.-pod-canary-gmail; Wed, 22 Feb 2023 22:44:19 -0800 (PST) X-Received: by 2002:a05:600c:4494:b0:3e1:f8af:8da4 with SMTP id e20-20020a05600c449400b003e1f8af8da4mr2101060wmo.1.1677134659298; Wed, 22 Feb 2023 22:44:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677134659; cv=none; d=google.com; s=arc-20160816; b=Bb613icRJ1OfvscUzyBOCD1oFdpH2qtrZyOIGUSBTN+52d11rmkYVG5JO2Bf6Hol/3 v0MzK6zAk57UToC4Cl1MWVd49+VHFvrW/jxVKFLiFtqy58kFcg/jAGp1bG5CyyM1kyRw I5VrGqyme6BMP5xjN2G8qxYlsTTV9VuznIKgeJNVeZXyhrHhD689j8WOv5YOTZ5K6EGH Jbxhh/FvQHUjHMimnPlpsCO2BxVq4Hu1baK5U0hhHm0kR740GFQseb2CaAYS4gtH+CyV WRQfglK4dj39nHDLnrihXnVBq1LhQBUOSQDO43S5xfdfzpDFqfU6TkUmLpPuijz1goFw DrOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=oE2bJuFUb3dyxYHtGh67XsZbHV+kDF3DnuehsH9qMLk=; b=IWsXan8EEsa/lmWvb94l4pyaApUZMWUUTfTIwrz1WnNCug1Azuo7QK7Z2nb8EGUSLZ WcZ6v03y+LsXgbVTWupNcoWxzBDqubQEzFQVG9SjXfTSNa13zPwVwnlaC6j9PCyXj9yX F4i5bMoeFfg7BKqGGAb4/l2ts8pszlEPWO8haeRdy013TmAuSUSB351opkOauec9fQ1I 683dh6m547cNL2MTCBCwYSr1J+Q72BfOhnVNhDqV0JFHeKiBVdHi47gyYDLXCjjqgPWy ELJK/36nNl9QiP0Pxe22qmGLqqn7H253W4dMWCF93naU0GLeCPhPjITUtQyGLlfw1Mld TjBA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=deciKifr; spf=pass (google.com: domain of fm-72506-202302230644192b5843bfc98ed0077b-teow11@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302230644192b5843bfc98ed0077b-TEow11@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id u5-20020a05600c4d0500b003db0d2c3d6esi335422wmp.0.2023.02.22.22.44.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2023 22:44:19 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202302230644192b5843bfc98ed0077b-teow11@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202302230644192b5843bfc98ed0077b for ; Thu, 23 Feb 2023 07:44:19 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v3 2/3] deploy boot files via sstate-cache Date: Thu, 23 Feb 2023 06:43:58 +0000 Message-Id: <20230223064359.4171845-3-felix.moessbauer@siemens.com> In-Reply-To: <20230223064359.4171845-1-felix.moessbauer@siemens.com> References: <20230223064359.4171845-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=deciKifr; spf=pass (google.com: domain of fm-72506-202302230644192b5843bfc98ed0077b-teow11@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302230644192b5843bfc98ed0077b-TEow11@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= This patch changes how we deploy the boot files. Instead of manually deploying, we use the sstate infrastructure for that. By that, accidental overrides of the artifacts can be automatically detected. On clean, the artifacts are also cleaned. Signed-off-by: Felix Moessbauer --- meta/classes/image.bbclass | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ef7d5a2a..6277069f 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -3,11 +3,13 @@ # Make workdir and stamps machine-specific without changing common PN target WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +DEPLOYDIR = "${WORKDIR}/deploy" STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" # Sstate also needs to be machine-specific SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}" +SSTATETASKS += "do_copy_boot_files" IMAGE_INSTALL ?= "" IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4"}" @@ -355,8 +357,9 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" -do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" -do_copy_boot_files[lockfiles] += "${DEPLOY_DIR_IMAGE}/isar.lock" +do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" +do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" +do_copy_boot_files[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files[network] = "${TASK_USE_SUDO}" do_copy_boot_files() { kernel="$(realpath -q '${IMAGE_ROOTFS}'/vmlinu[xz])" @@ -364,7 +367,7 @@ do_copy_boot_files() { kernel="$(realpath -q '${IMAGE_ROOTFS}'/boot/vmlinu[xz])" fi if [ -f "$kernel" ]; then - sudo cat "$kernel" > "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}" + sudo cat "$kernel" > "${DEPLOYDIR}/${KERNEL_IMAGE}" fi initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" @@ -372,7 +375,7 @@ do_copy_boot_files() { initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" fi if [ -f "$initrd" ]; then - cp -f "$initrd" '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}' + cp -f "$initrd" '${DEPLOYDIR}/${INITRD_IMAGE}' fi for file in ${DTB_FILES}; do @@ -383,11 +386,16 @@ do_copy_boot_files() { die "${file} not found" fi - cp -f "$dtb" "${DEPLOY_DIR_IMAGE}/" + cp -f "$dtb" "${DEPLOYDIR}/" done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install +python do_copy_boot_files_setscene () { + sstate_setscene(d) +} +addtask do_copy_boot_files_setscene + python do_image_tools() { """Virtual task""" pass