From patchwork Fri Feb 17 10:01:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2658 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Feb 2023 11:01:55 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f62.google.com (mail-wm1-f62.google.com [209.85.128.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31HA1s9L022216 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 11:01:54 +0100 Received: by mail-wm1-f62.google.com with SMTP id o15-20020a05600c510f00b003e1e7d3cf9fsf518111wms.3; Fri, 17 Feb 2023 02:01:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676628109; cv=pass; d=google.com; s=arc-20160816; b=ZqS4l/Vjn3z1AycmWmU10CdDVcvqqV7rNsujXoKKxIOr3XPR8uj9F8mNuFQpU49W0n UGQ/7qIBi0+dkx7SwZQXd70YQaubbihaAfdkxk2YPQhCl1s4ke9TTddT+lLk0tYFCfb+ 9UZj2W8Yv9TlqnE5PwA6vZ1SMco8MQJP8BmhvVr0YMBoAtir8QYNo5gYpvNYfenY2r3a 6FNFihDrOOjZ2O5hfOAriUQRFATEfYFlLwDrWA3u6lUpNLSwyHP3e/kjCt4ZBldK+SVq Wv0Xmm6PdCIZ5bMEtQVL8WAKOUlUdECfa4lgL+gEea5x88Y/Bon/RTWZi1T+JlaEagKj VONg== 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=bUOzqLqZLfKm4NDJfIfJrJzP+11oh7QOBtvL+k5mies=; b=RyJOKcr9cHe1jZ6VP1WvlHEYkbKAcFcuD7R0QHT1SnHgys7Zt+hiKt+BTA+8uHh9Zw P8nMlVHvxGIaY73P97J7FgoOglhFmgYv8eEGAtT+y09n8m+UhK33B/n/iVgjCXayfyXb sUdrkFWi8heZNQJOEhpDKOsb1FeVk23CCj7G0HBTqhTsLCl6e7QVQgO2WDuEzhJkdgSD j8hm2qT3ivDfkmzadF4FGu8sH3lgTQydULct2VrT6Ojcglf+3rDBQRHLQd4D0WxKN82u eVi8TWslPKRiOWz/u/jBBb0CTkB19v/RkUDJsQvhSSQKSF/82rx3QoCjnaya22D/AOrg Y0lg== ARC-Authentication-Results: i=2; 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 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=bUOzqLqZLfKm4NDJfIfJrJzP+11oh7QOBtvL+k5mies=; b=OoiIzbaCHzaEr762EVyO1N7r2IJg/qeeT5ElDyp7AURWJzMO0+v0PjdDmEDeJ7M4dT u5RGbM0EWXIJrT88TB+vBBY5bEsiAODZmQma6TD4UfoywYXXFf6tpTg0rqWavYwK8FsV RutOBQxVth43wT300gOqLgRrYj6jy/lx5XjZzIgTSzS8/pMLYRKtX+PXeuU4L1srbPgr L0msxJvQVORknstWdPqIaHuPBgX3ESuf5EBl0ijJtRFHgiBwGoTNILcVC+MOnlpL1+hw p/NkrL4VKpPUJFvHWkCSaN9QmV/W90SZ+ylu5N9+xBtuUfY6thr6hcjXa5V+UiYu14ws QgiQ== 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=bUOzqLqZLfKm4NDJfIfJrJzP+11oh7QOBtvL+k5mies=; b=Uo3xKYGZVsLETEWrm3GisQVT0Z+kwqMvaUCFq+wbf3riYQ49i00/BvXr5CIXVMCV/F gjHs8HjPv3xFrVuOu/xtFZBB2GLXb5UJg0h0DGdXsWvNEkBi2MEACjMHNDh6nzZR3k/I o1aYAu6fAwt3QblE+SUHsxiTsP96k463Lk9VuXn6S9rbdd+SvUO9Tj5VqTtvqOmG9HpD DScA6k7GZJ9NvVceDOQMn6e/nEh1NRcH0EOwiw7wWmQeeVefI5/x5sFYzMfQksfuhOb+ LN9QvKLCH0qNktY4SL2hLjjqpomLYnlgA4NjdNQZYdpfBa2fgYROWh9gK3TPD4pdIKvv 6F4A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKWKlS6qL1B1Uj3aekWo/p0hSkYTlMTzMgfUUOUZTs5YPslOpWu2 jeX0kCSgoyYp1fbcFmIMDzc= X-Google-Smtp-Source: AK7set+gh1V5JyXJNywENhZ0l5oSGCuMaGxHmQJ9QpsPlQVMY6aUdc9v3Eqsb+RyunpNBPBblkiAVg== X-Received: by 2002:a05:600c:1c0d:b0:3e2:905:9435 with SMTP id j13-20020a05600c1c0d00b003e209059435mr601569wms.2.1676628109095; 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-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 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; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20230217100147210381c57d43022e52 for ; Fri, 17 Feb 2023 11:01:47 +0100 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 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=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 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