From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7201062888117633024 X-Received: by 2002:a05:600c:3483:b0:3db:1566:aa01 with SMTP id a3-20020a05600c348300b003db1566aa01mr456008wmq.29.1676628111259; Fri, 17 Feb 2023 02:01:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a1d7:0:b0:2c5:55ca:3a3b with SMTP id v23-20020adfa1d7000000b002c555ca3a3bls299703wrv.1.-pod-prod-gmail; Fri, 17 Feb 2023 02:01:49 -0800 (PST) X-Google-Smtp-Source: AK7set/JA1Yv5qrtZWnogMqXXLuHPV5HbbyFCGROpq7+NCyEqZamiR1vN3ImUxNOAPOFPr3R3kph X-Received: by 2002:a05:6000:1052:b0:2c5:54a7:363f with SMTP id c18-20020a056000105200b002c554a7363fmr6868357wrx.63.1676628109545; Fri, 17 Feb 2023 02:01:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676628109; cv=none; d=google.com; s=arc-20160816; b=CZe6VZq6sBQcVNuDWACgfJ1qdBjK3+hci2ey4xCN/AWsjoQ7zqmEp6OcWIXeTSZoOA cFh4eBoBboSMeo+JpNd6fH3Fpg+NXZYkmsGToLdhEDATYGCHDWnsaFjGLVqhWe2EODYV j8/F8g9Zp4dn9UggZX6ZnHh7XQe2qTVT0Go5/CWlX5to3RSNCe1y6NJ4WnbNcQ3OJ0gi DrPh6n2JrI17DgvJJtfCqyLkOeM5WYuj9GAbBontfUJVd8QLkH41xTryeZjHYCM4wsXs obxr6hpL07xzism8MGxF4Jh7T5W1X7+sapewZaCKO4ADj/56wFBjSGRNJUnJ7INgV4aC yqGA== 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=dPqW/CWznTAYLYDFvIcCEh0FmqiNcSNT/BUj9bSN4Mc=; b=PaIn1mWW3/pPEt3N/Gb0WmHmXiIP6m+krwc3yvtITMJXSH9qgvtYT1+/6V1UAxYjn/ Jf4/kE13TCJKOQA4SFQ40lmE88uWm+A/vt++LsLtht/+dcOTjXw5xr+nnbmMgoqSbv4R wX2FNt5LgpvuhLPS/Ix/Ux9ApJmvccJBk5KuFRZGEeYwTd3ZgORMAgqk8MrmbpB3riQg JGut/nWPerrTD5dYfHTRF68TcUPfwfxli3bDnDURCSf4vWKusGMguVR7k3nKq4wM3IKY 1MTPMmOJnUQyt1JtSsuWyATNKPm+9RF/0mn1TMJp+5EpXEick7djT3ddQtt6PDul8nZR pdJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nx24r0UB; spf=pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2023021710014972a10dab83eeefcb46-njmNk_@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id ch18-20020a5d5d12000000b002c5598402acsi121718wrb.0.2023.02.17.02.01.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2023 02:01:49 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nx24r0UB; spf=pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2023021710014972a10dab83eeefcb46-njmNk_@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2023021710014972a10dab83eeefcb46 for ; Fri, 17 Feb 2023 11:01:49 +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=dPqW/CWznTAYLYDFvIcCEh0FmqiNcSNT/BUj9bSN4Mc=; b=Nx24r0UBJO+FZbbc6l9ryhW/WLT3A8JURtrf0v/9Zlj5upoo1+7AEx+U4XqRsFfBLapPgc NA9y91xCOpVHHz50GF65qE7Njrk4XE+UMnSykhRuCDBCVYHYHOBOjReF/sW1HfMhsiK1mvUF cbtqytA8iw664KspEY9HoMjXXsWTc=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 2/3] deploy boot files via sstate-cache Date: Fri, 17 Feb 2023 10:01:17 +0000 Message-Id: <20230217100118.2912985-3-felix.moessbauer@siemens.com> In-Reply-To: <20230217100118.2912985-1-felix.moessbauer@siemens.com> References: <20230217100118.2912985-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: +nl1weHu83UG 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..e799d1d4 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-${PN}" 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