From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7201062888117633024 X-Received: by 2002:a5d:4d85:0:b0:2c5:532a:98c0 with SMTP id b5-20020a5d4d85000000b002c5532a98c0mr370611wru.13.1677134660949; 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-Google-Smtp-Source: AK7set82WySz2//e13rnu5R4zJWoY4ywP4/P5x+KdQOrxQWl7FHh16DfQvMNOdriByoHBdOjAMgi 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 Return-Path: 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; 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 Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202302230644192b5843bfc98ed0077b for ; Thu, 23 Feb 2023 07:44:19 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=oE2bJuFUb3dyxYHtGh67XsZbHV+kDF3DnuehsH9qMLk=; b=deciKifr82tilgSkKPIXtGcvkFzvxXk5uUc2cvlRo9RKTUCTvBvyL5eV+vkeNzrJ9+tKhH 3MBux8T1BFefrLtTmz40EMYzNJlz1HDEcbJVYUEOZE7oFMIZ7LrtJo5Q+MlexuGswG6Nlq18 UtdjKPrIyGE5d8kl8fHsxfLcXvO6Y=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: oGsAOgVW+vmo 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 -- 2.34.1