From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7201062888117633024 X-Received: by 2002:a2e:a228:0:b0:294:6f14:2365 with SMTP id i8-20020a2ea228000000b002946f142365mr1870029ljm.4.1676716269860; Sat, 18 Feb 2023 02:31:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b91:b0:4db:51a5:d2e8 with SMTP id g17-20020a0565123b9100b004db51a5d2e8ls146807lfv.2.-pod-prod-gmail; Sat, 18 Feb 2023 02:31:07 -0800 (PST) X-Google-Smtp-Source: AK7set8VVOAsm59qO+l2zPgLBiSF618FW92zjhOEdqYgrxXcE1q1L3rPm4sC9yKw/hLucb6/xReH X-Received: by 2002:ac2:5550:0:b0:4d5:acb3:fd24 with SMTP id l16-20020ac25550000000b004d5acb3fd24mr1123748lfk.54.1676716267918; Sat, 18 Feb 2023 02:31:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676716267; cv=none; d=google.com; s=arc-20160816; b=jk9Fh29iIuNqD/SHgqNseclzGadEWKjZNaA+VJHiE3OCUSP/l2jFh9QlM0eO8yDYg0 +GJCFidIP/oKRoC/QHsPahHstIs2mISuzSnVV3WmC1IjbkrUbkZFk+gOlzEplh35SU/L eRA3CMHKofXnQrQ5CflBmbbPhQPG/JqaQYaPH2x9XSPbCoiY+g/easqKvnVwgMgsor6G mRh2UPGItVkWdLgtJVUYyka5qaiaczEiGAXk3HjzCFg7Dc2unKqCvI79RcDa/f+/RP/L AvSKluUPpBxpDLXaVcZqUB1ZH2TK93pPTU95RbMD9S+6Tvb2NKveMzbdo+r7d8ab7iKw FyVQ== 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=x5K4KVWgDRt07z6BoTUEN5qFVDwNa7jPOHtBy5MZvIClqAWkkFRONdC7/Skkr3g84e SJaVwiKKPA1yuSxfV59sNjvCbLZ6Hm1kPf17cYbjbvawpXTAEv8I2RadCLpr6FpUha3D 40OF3Bdqz+7L2X10js9czcG9yAaZ0CU3gv1nEAAWYU7PTM+gpFMvwqaEA7Gc9cTdJI5p /N/x/dXJW0Ztm5BFxwfyW+YpYBt+lFxstwPPWgb5C/rAK4OOCZbKyxw5B4akJP3utlQW H6LxracHE/hNfE2ZJz+LmCKNsfI7TcxXpQ5MQeAP1HszIxwXQ7lEuhojGlHMc06jZ5M3 rN5w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RgbO7SRh; spf=pass (google.com: domain of fm-72506-20230218103107d1b7e32fae3b41597a-gqpvis@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103107d1b7e32fae3b41597a-GqPVIs@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id t22-20020a199116000000b004d5786b729esi249835lfd.9.2023.02.18.02.31.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2023 02:31:07 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230218103107d1b7e32fae3b41597a-gqpvis@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RgbO7SRh; spf=pass (google.com: domain of fm-72506-20230218103107d1b7e32fae3b41597a-gqpvis@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103107d1b7e32fae3b41597a-GqPVIs@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230218103107d1b7e32fae3b41597a for ; Sat, 18 Feb 2023 11:31:07 +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=RgbO7SRh3A0t61Q9ZwQ5WUMHi0e4SDhwbzJ8CbQr+YdngUCbO/JMk2NQBA29japjEHYHjz FMBCGLwwhcVFYBiK9CjXdjf2pb1kNHek0mO3Vh4KIhC/41ZvjuAsOQ5fv/BRulElAqqJwBMM NAs1w4pygzJx1dznHbVKW4SdL/RVU=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 1/3] add initramfs to sstate-cache Date: Sat, 18 Feb 2023 10:30:36 +0000 Message-Id: <20230218103038.3005105-2-felix.moessbauer@siemens.com> In-Reply-To: <20230218103038.3005105-1-felix.moessbauer@siemens.com> References: <20230218103038.3005105-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: a9InI80CHHdg 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