From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7201062888117633024 X-Received: by 2002:a05:600c:540e:b0:3dd:1bd7:75ed with SMTP id he14-20020a05600c540e00b003dd1bd775edmr560415wmb.135.1676628109125; Fri, 17 Feb 2023 02:01:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:a01:b0:2c5:5262:2e24 with SMTP id co1-20020a0560000a0100b002c552622e24ls271426wrb.2.-pod-prod-gmail; Fri, 17 Feb 2023 02:01:47 -0800 (PST) X-Google-Smtp-Source: AK7set+zen0CRyQfPfy5ZonXM8pfVHsRAgkDpsuQuR3zOBlNs5ackNPi8zcMmWypIO1MGE2Bp+17 X-Received: by 2002:a5d:4f0a:0:b0:2c5:6081:5b3f with SMTP id c10-20020a5d4f0a000000b002c560815b3fmr6859180wru.69.1676628107493; Fri, 17 Feb 2023 02:01:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676628107; cv=none; d=google.com; s=arc-20160816; b=DtNiPQGv2IBMdE9+oAxM2uoGaiv9s3vCtuOWxGDl0e8ZEoi3Od1vgU6o4KoK/f/lPS 5WKzetn52Tm/gFoKejbONwUzCeZvae86hOmE7m1VaOa87i1qxoFRALcD/h+ZQvp8vKLV 1fH2eJU8Mzo1ruAdWl7Q/RrM5FiBCRpVKsOebPbpwnxd2XmdrgrpDxD+1VGnE/9vsX0X SglPu2hVspNy9GzbfP+jJpsTEHocR1lm2HMkCvxoGE9eeudSWPcHYLrFQ6b6Hog8fckG 4wuZLMi2s7j/7uWw60Fw7UbT/Z43zpTlkPepP/lHE4UECsT+gEk3qp4SuxX+mfWXj7Vd WslQ== 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=pA50mZPd52qVdESQNE7ICzh4QaqNLiZcZ7aCSV6rIvQ=; b=Zb4/hzbDMdQvwp9Ir+arNpiO3WIB9lIl34x6M9+W2beuHx8nPDH3uEazANMN8jKFJ1 HsQ56/p9PaKNi6JYqhI86YCQri8Kv4irFLQgkaHh7dO9nivw+//8aWqEncQWgCsyPUC6 /MXfuxk34tuJGo1LTMN3YXNURyb4jkZBmk0shiReKDoitxGb7Lf+MXB7xOujRepKHGqF PVMXeVrXxojVz3PiZI35NQGc6zUCJOvcuYt10n9Laj3s8aaT97Zn/um3JR77XKnLmgLA iuoncSM1r13gNjdXeH0IFyNB2B0j02UqhVsMZ65tCklXUL2eUdJMK4vnUzWrENRbkbgK UGHg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QFlVJHMP; spf=pass (google.com: domain of fm-72506-20230217100147210381c57d43022e52-fxrace@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-20230217100147210381c57d43022e52-FXRaCe@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.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2023 02:01:47 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230217100147210381c57d43022e52-fxrace@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=QFlVJHMP; spf=pass (google.com: domain of fm-72506-20230217100147210381c57d43022e52-fxrace@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-20230217100147210381c57d43022e52-FXRaCe@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 20230217100147210381c57d43022e52 for ; Fri, 17 Feb 2023 11:01:47 +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=pA50mZPd52qVdESQNE7ICzh4QaqNLiZcZ7aCSV6rIvQ=; b=QFlVJHMP9olfwvn85W+CM+bWVhXCeN2PbL0I2GNtC/JNZ0SwdDyHk/o7FlLU4tEFXMeES1 h9fpKSEeLyulIB/dGfLuIjN6kQe2VxnQnY5axeLqa6AyMY3MIKYNfWKCyX+8d3ksUAtfjcNB ThwXJcCSL4j8EX0aJlb5sRvWZB63c=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 1/3] add initramfs to sstate-cache Date: Fri, 17 Feb 2023 10:01:16 +0000 Message-Id: <20230217100118.2912985-2-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: hcig8vNUI26Y This patch changes how we deploy the initramfs. Instead of manually deploying, we use the sstate infrastructure for that. By that, accidental overrides of the artifact can be automatically detected. On clean, the artifact is also cleaned. Signed-off-by: Felix Moessbauer --- meta/classes/initramfs.bbclass | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/classes/initramfs.bbclass b/meta/classes/initramfs.bbclass index a5141a53..183d1933 100644 --- a/meta/classes/initramfs.bbclass +++ b/meta/classes/initramfs.bbclass @@ -2,16 +2,19 @@ # 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_generate_initramfs" INITRAMFS_INSTALL ?= "" INITRAMFS_PREINSTALL ?= "" INITRAMFS_ROOTFS ?= "${WORKDIR}/rootfs" -INITRAMFS_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${INITRAMFS_FULLNAME}.initrd.img" +INITRAMFS_IMAGE_NAME = "${INITRAMFS_FULLNAME}.initrd.img" +INITRAMFS_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}" # Install proper kernel INITRAMFS_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" @@ -27,8 +30,10 @@ ROOTFS_PACKAGES = "initramfs-tools ${INITRAMFS_PREINSTALL} ${INITRAMFS_INSTALL}" inherit rootfs -do_generate_initramfs[dirs] = "${DEPLOY_DIR_IMAGE}" do_generate_initramfs[network] = "${TASK_USE_SUDO}" +do_generate_initramfs[cleandirs] += "${DEPLOYDIR}" +do_generate_initramfs[sstate-inputdirs] = "${DEPLOYDIR}" +do_generate_initramfs[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" do_generate_initramfs() { rootfs_do_mounts rootfs_do_qemu @@ -44,8 +49,11 @@ do_generate_initramfs() { if [ ! -e "${INITRAMFS_ROOTFS}/initrd.img" ]; then die "No initramfs was found after generation!" fi - - rm -rf "${INITRAMFS_IMAGE_FILE}" - cp "${INITRAMFS_ROOTFS}/initrd.img" "${INITRAMFS_IMAGE_FILE}" + cp ${INITRAMFS_ROOTFS}/initrd.img ${DEPLOYDIR}/${INITRAMFS_IMAGE_NAME} } addtask generate_initramfs after do_rootfs before do_build + +python do_generate_initramfs_setscene () { + sstate_setscene(d) +} +addtask do_generate_initramfs_setscene -- 2.34.1