From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7201062888117633024 X-Received: by 2002:a05:600c:3b11:b0:3e1:1513:a50d with SMTP id m17-20020a05600c3b1100b003e11513a50dmr1374046wms.198.1677134659197; Wed, 22 Feb 2023 22:44:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c8b:b0:3dc:5674:6707 with SMTP id k11-20020a05600c1c8b00b003dc56746707ls1747868wms.2.-pod-canary-gmail; Wed, 22 Feb 2023 22:44:17 -0800 (PST) X-Google-Smtp-Source: AK7set8igOahy9MC0WoK05++K0+AlYtQh2t6CoF8QGRt9AHm9CXeLTicTomOK0RLHJB3GranKfMP X-Received: by 2002:a05:600c:1da5:b0:3e2:1dac:b071 with SMTP id p37-20020a05600c1da500b003e21dacb071mr9940555wms.13.1677134657660; Wed, 22 Feb 2023 22:44:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677134657; cv=none; d=google.com; s=arc-20160816; b=lCepGDpFgUmvLQurnLhfcR2flJ5e2UfUpYXbJHW+BHGkmBYtGqB3OdFeEE1lmnwbfI 7McCeGDBg8sV71IP2yVFkcx2biG9ybZDzZVgaJpbKFzVJbsZ6mvYSl6YqoiSikw/REiW oOTacbWRsMZSj1deJl6GzKLjeXczk+8rEd+9894Tmr4s3d5aUzwfkk5ia4DvkrJXIRCt IsDB9oU0/B+s6w6VHfiaPd28VvWFMnNGTEiQI6Tqoxt4befe0SnMHsYMRf6MJ9QjNX8g HFtTBBqIQfWuyF7IDv44N44cETKy4TUEIZXOt/5s0DL6F2YJ/BclNJKiNQqhEwt+7/hh 0Nig== 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=DsYAULuOSfbJXDPuvqKAiwM99pWaPLTl9ORMjf75QMbtXeSiiyFfAXbs6aZzUbdZhX s0++6m8EfW6mevPhYdMGtQEwGmSwufjJ0a3kI0EXSPL0NsSplluLbLByZic1T1golDm3 AiSoDnjqf9nfLEAjh3REegzs+PTAbmKh3E1hf7q4LwdCtXFs94t4grTYn8YzZ0H03vwO 7VnC/5L8jervW+3Ba4hm0Cm3sAdtsw52oxTQPaGDq9z+Jh9QrS+Z8CEZtBYXToMOT4XB tEYkSDXhV7SriiUfBlTiqS2hbex7aVcsY920BbJ9wcNqwJ68DvcGcGnNsfJ6zBWwCVkW 423g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=TbHbFm1D; spf=pass (google.com: domain of fm-72506-20230223064417baf7754f2c2fd8a5f6-lhic_1@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230223064417baf7754f2c2fd8a5f6-lHiC_1@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.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2023 22:44:17 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230223064417baf7754f2c2fd8a5f6-lhic_1@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=TbHbFm1D; spf=pass (google.com: domain of fm-72506-20230223064417baf7754f2c2fd8a5f6-lhic_1@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230223064417baf7754f2c2fd8a5f6-lHiC_1@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 20230223064417baf7754f2c2fd8a5f6 for ; Thu, 23 Feb 2023 07:44:17 +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=TbHbFm1DJt+EJA7jQRJ4gvuS3p4KNejctriLpJZU+D6gAqowLjKFWbed2woYEMgXzkEyYF Ko5o6U1395GikWdhI3256DjvRdO/M8lHz3aapwGVMdeOz899iueA5X4549DakDWQ9fXTfEoN MwsLx+eNxLGJBXTEOUaiS6DF28tOI=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v3 1/3] add initramfs to sstate-cache Date: Thu, 23 Feb 2023 06:43:57 +0000 Message-Id: <20230223064359.4171845-2-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: IWg7vzW3GhR4 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