From patchwork Thu Feb 23 06:43:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2683 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 23 Feb 2023 07:44:24 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31N6iO74019160 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Feb 2023 07:44:24 +0100 Received: by mail-wm1-f59.google.com with SMTP id z6-20020a05600c220600b003e222c9c5f4sf4667880wml.4; Wed, 22 Feb 2023 22:44:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677134659; cv=pass; d=google.com; s=arc-20160816; b=OhcfTJ6Mc3tak9UW9dy/aHNuPgZpHUaQ94A9wZWu8YQtsMQntQcJl6aj6dQckr4a99 A3Sw7M0ChcLw2842PsNHlR3sVV8z6KUqd1AoW00Zb5yOj4s+NezVV3Fh6V39cE2W/4rj Me49V0R3+OJ/MyvgTair9gxZj5qpbAWtSdjnBZ3t8vbIgNLqWY21wu46gIgxHH7WrjiV mDk6UbvAjIE2n5ThEDMUlCCCvRDguFwRiAkLe1ystYWYuMtIYxRWivu5fD0ZWi2oGUvI 6B6BiFT2z93TcAGlWmWVJlafBcoYRujxDct7fH/abg+qvbkaQL2ibCAB+So58Oek03Oj RJMA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=RqiRvL+N0nbmACQqvUnbdy+/e75u4mr+6ITkv5DCvLo=; b=hGrfK8arAbwhBU219qq3/Lmb7uYMNsO3qegr2JrU6AH/PbDxVphzeA79+Tw+pO8rb+ QVukuOBXKABj3hjAAt69GeYAja9K+5MUoCiXm+KjsP6nOCgfhnnTVGzG2nLZOBNFF+cH cSOt4MTpBM84bqf4MpZP3qpyQHrJ1cdkyCw7PqhyeMRb4bFGjnCcpD+w/QHsioFolFCD HsoC5pwW62HnvbML22hgdo9zEj6MHvkMiGZEA1RRVOePM/iAG3mJZgUtsaTi83ikKXAS lMFIVjdirv3bTUmzShsYm+h20fw974eLJK9MQaNT5gZdnjrevCdLFnCNbUz2RxvOVSXf rZ+w== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=RqiRvL+N0nbmACQqvUnbdy+/e75u4mr+6ITkv5DCvLo=; b=Z3Kgq67OQEJs0QuKBsgqrkiyqFdd24kIs9q2d4wQQhJPExm69nw4xDxCdLvvDbXclE fmkbDi2S8KVoGtXlYvdSk4gSTJO7NToKWnGS2c+wTUPTZ7y1cwEjlhLEGW5SN5zkQmka OTojroqqIgBLj3uiU24PUqYhYwZYte/YQaSrdyXir9J8gv8dRiY84sN0IkLG//n0ms0f zI8c9/+GgRJ8idA1gkoywTmzMRGVvOPpW0CG72ma2t+6lF+Xab4ujFooHOjj3ErXcXWu tSEw7dGs+y8PsWO0lOpRDhwrEPleRAjOexkKuCmAFqR4Z18bf6sW3FBENoyBwtIU6up3 v8iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=RqiRvL+N0nbmACQqvUnbdy+/e75u4mr+6ITkv5DCvLo=; b=FQR5Yhvti9vsH/zaldZ5L6LiJOt4xYAQm9j0X/NH7OBULzedwfGG3AATIUr8Z/w3dI QQ19vs9051hFhca8GlRHNdHVvSB7LeCoXHpGDDPOtoEndbTPQ7WnX3e/Dg47e5eEyo8a qSM83mQQKMMcI6rINIne7qTuwU2PQH7K+QnfhCq/m6Cc+HscW+tHh4UOeZeOtDTMYK5B owXfHvs5tL8UdVkhwf4KDiKv8qV7F7f3V747kV9DX4IPqukOpxkd/dmF+c1a1TVHxKJh WdKM7slofcQ5eqr/gETlmyhEyXkDPJoOq99KZBFiyaKOx7ivBWEoAd7HXHiyy+sOKk5Z w8kw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKVY1now4c9Ia2Du8+3vgodscE1ZoboXMQonrzGJhVYMo7KbO7Mj M+Zy86mCCofWY16dLb8v9Ak= X-Google-Smtp-Source: AK7set92Ku/Px9W1kqeEojQq3ff/CONvsHRPaeimbhbph3wzoNNaYPjkr5HoOHS1AUlgtMxtGY/OaQ== X-Received: by 2002:a5d:4c45:0:b0:2c5:54fb:2b22 with SMTP id n5-20020a5d4c45000000b002c554fb2b22mr587720wrt.3.1677134659097; 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-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 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; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20230223064417baf7754f2c2fd8a5f6 for ; Thu, 23 Feb 2023 07:44:17 +0100 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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