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 From patchwork Thu Feb 23 06:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2684 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:26 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31N6iQt0019165 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Feb 2023 07:44:26 +0100 Received: by mail-wm1-f63.google.com with SMTP id c7-20020a7bc847000000b003e00be23a70sf4670420wml.2; Wed, 22 Feb 2023 22:44:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677134661; cv=pass; d=google.com; s=arc-20160816; b=qe0rjevnxGtaBtgNGmptCWlXP40EvUgfNxUDPNj6vbYaMU0HtYVTjZ+iVs1nTlGWZr vGjHHMesUHpAojWDMpZWvmppyDI9ZWmSZf+4lj3aQMgqSIfKSFSEeD05KeR5EgxvUyAF W3g1L6BPR5JYmp9I1mlg2qyY/G4KAQdYOAphFe0M0YcvfSt10O+y1gqVqQmVVY6zmLra raXpE7GnLSELEwMkemdgYfGfNQrOdHpqIIL7wXu/Nfh0sv3BZlWIG5KCAZayfqqs34Bl GrCzo2YLUfLGFoLr1BaBMuF0T6ff8Abu6gc/c29OOiW+DM74qBsOyZmNbZbbLHQvBtFn r+2Q== 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=1zDOT4Z+RGIQXzP9Pf88HL6Na43pZ86+mEOk0nWWbvE=; b=SizDDw20GYkt1f5yTSR9vpaz6hTEpBQQJGvfzY2uwtLl95ayZ7HKUk5WVUpBqNBZtz l88lr3HhPZu2oppMd/2uIt/fKqxmuVgCShyhAbzeEz9zdurMRAtU8iWcCVx4U5tnYjRo wlZ2ZRZjypDkM2RZEt4kdiXS0sA76cu/SGYovL20Gd/dXiY8O5OKSQUw0uiZhJppESTK D0zW+QI0eXWPf5V/UWglWH3IgpZ38i+5R4/QvZKoGaXg69jSdpu6HuTTQL8CQZvTGMXa Yj7yPxIDU8h73xntWI8K0L+eHE8gGjJQjZVl1HzSCb8opSP+wv4NVw6xv6pk+JOC/Be+ bRew== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=deciKifr; spf=pass (google.com: domain of fm-72506-202302230644192b5843bfc98ed0077b-teow11@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302230644192b5843bfc98ed0077b-TEow11@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=1zDOT4Z+RGIQXzP9Pf88HL6Na43pZ86+mEOk0nWWbvE=; b=Qjlk+ngSIxYRtZuQJfz5Wu8oouAYm5r5yDDbozdyNAWfcBbKAbNQ0xQhfRN8Jl8ddX kKyMWohbNBBQHiY5+53z9xDj2bbpWRSscXfu2/OnuHvbE6T+6gCyVz5hPjAyypyzY372 8vkEiCa25/2aTFqni7McnRPTCp198VxiY4xpYg3L26fflVCKCnyqky037NpxKmyxWnha eApsfwyjTqHQTMf8McRMEV0eMNqmKYEePFjvl2nYeCe/eqGLJ6zhoIdLZ+77DAG2Lhog Pi7lLExIemKCYA/tpTEWeFDUkl3+Jl++8s/GI3IBLKjLs1QDthFKaCS6CO1+pEeQkbO4 5HTg== 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=1zDOT4Z+RGIQXzP9Pf88HL6Na43pZ86+mEOk0nWWbvE=; b=GN+fhc3j7JonrgUFUtWX7Ng/mOxDc81Qk9g9ZYogiDCJjCK05zpQJHPstY5Q0pSsnA 1axn2OwgIb0krKnP9QNNMU65kNn7cUa0HraUdkPtDmNL63l4ftp4Vu7/ZTVvAX/7QJr2 eCufganTr+5jvUl1W/hONBm1g/pU7EQLrqpzf4+C/YAtOgrGFBaZhgRoYfr0E4jZ25V7 nd7nt9URht5mZ320vjy0h+xxI3apQJpgtsahZvD5IhEavQNoUhbahL4i2pKtLZOr5BbS GCaO3Ta6oqoH5qXDk6rFBZEQKA2qUvYL2fRIB3py3QwAe9Dv1uJD5FKIBJ0liUcW91kn mQsA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXs01qgVvj795VuCGIbiRKVy991aujbP1GPjEAPnSPMTq2o2cO3 dLhRpUVZlDsVXWiuUKCO+D4= X-Google-Smtp-Source: AK7set/VsqOdArjqfsixSA5/xNOGjDEX17PwR/6lhjUlmhD1c7TZ2RlIHdF5yCD3wRvrKgkXd5YdWA== X-Received: by 2002:a5d:6410:0:b0:2c5:8377:3eaf with SMTP id z16-20020a5d6410000000b002c583773eafmr469734wru.2.1677134660848; Wed, 22 Feb 2023 22:44:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b04:b0:3cf:72dc:df8 with SMTP id m4-20020a05600c3b0400b003cf72dc0df8ls1748407wms.0.-pod-canary-gmail; Wed, 22 Feb 2023 22:44:19 -0800 (PST) X-Received: by 2002:a05:600c:4494:b0:3e1:f8af:8da4 with SMTP id e20-20020a05600c449400b003e1f8af8da4mr2101060wmo.1.1677134659298; Wed, 22 Feb 2023 22:44:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677134659; cv=none; d=google.com; s=arc-20160816; b=Bb613icRJ1OfvscUzyBOCD1oFdpH2qtrZyOIGUSBTN+52d11rmkYVG5JO2Bf6Hol/3 v0MzK6zAk57UToC4Cl1MWVd49+VHFvrW/jxVKFLiFtqy58kFcg/jAGp1bG5CyyM1kyRw I5VrGqyme6BMP5xjN2G8qxYlsTTV9VuznIKgeJNVeZXyhrHhD689j8WOv5YOTZ5K6EGH Jbxhh/FvQHUjHMimnPlpsCO2BxVq4Hu1baK5U0hhHm0kR740GFQseb2CaAYS4gtH+CyV WRQfglK4dj39nHDLnrihXnVBq1LhQBUOSQDO43S5xfdfzpDFqfU6TkUmLpPuijz1goFw DrOg== 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=oE2bJuFUb3dyxYHtGh67XsZbHV+kDF3DnuehsH9qMLk=; b=IWsXan8EEsa/lmWvb94l4pyaApUZMWUUTfTIwrz1WnNCug1Azuo7QK7Z2nb8EGUSLZ WcZ6v03y+LsXgbVTWupNcoWxzBDqubQEzFQVG9SjXfTSNa13zPwVwnlaC6j9PCyXj9yX F4i5bMoeFfg7BKqGGAb4/l2ts8pszlEPWO8haeRdy013TmAuSUSB351opkOauec9fQ1I 683dh6m547cNL2MTCBCwYSr1J+Q72BfOhnVNhDqV0JFHeKiBVdHi47gyYDLXCjjqgPWy ELJK/36nNl9QiP0Pxe22qmGLqqn7H253W4dMWCF93naU0GLeCPhPjITUtQyGLlfw1Mld TjBA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=deciKifr; spf=pass (google.com: domain of fm-72506-202302230644192b5843bfc98ed0077b-teow11@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302230644192b5843bfc98ed0077b-TEow11@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.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2023 22:44:19 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202302230644192b5843bfc98ed0077b-teow11@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 202302230644192b5843bfc98ed0077b for ; Thu, 23 Feb 2023 07:44:19 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v3 2/3] deploy boot files via sstate-cache Date: Thu, 23 Feb 2023 06:43:58 +0000 Message-Id: <20230223064359.4171845-3-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=deciKifr; spf=pass (google.com: domain of fm-72506-202302230644192b5843bfc98ed0077b-teow11@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302230644192b5843bfc98ed0077b-TEow11@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 boot files. Instead of manually deploying, we use the sstate infrastructure for that. By that, accidental overrides of the artifacts can be automatically detected. On clean, the artifacts are also cleaned. Signed-off-by: Felix Moessbauer --- meta/classes/image.bbclass | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ef7d5a2a..6277069f 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -3,11 +3,13 @@ # 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_copy_boot_files" IMAGE_INSTALL ?= "" IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4"}" @@ -355,8 +357,9 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" -do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" -do_copy_boot_files[lockfiles] += "${DEPLOY_DIR_IMAGE}/isar.lock" +do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" +do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" +do_copy_boot_files[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files[network] = "${TASK_USE_SUDO}" do_copy_boot_files() { kernel="$(realpath -q '${IMAGE_ROOTFS}'/vmlinu[xz])" @@ -364,7 +367,7 @@ do_copy_boot_files() { kernel="$(realpath -q '${IMAGE_ROOTFS}'/boot/vmlinu[xz])" fi if [ -f "$kernel" ]; then - sudo cat "$kernel" > "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}" + sudo cat "$kernel" > "${DEPLOYDIR}/${KERNEL_IMAGE}" fi initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" @@ -372,7 +375,7 @@ do_copy_boot_files() { initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" fi if [ -f "$initrd" ]; then - cp -f "$initrd" '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}' + cp -f "$initrd" '${DEPLOYDIR}/${INITRD_IMAGE}' fi for file in ${DTB_FILES}; do @@ -383,11 +386,16 @@ do_copy_boot_files() { die "${file} not found" fi - cp -f "$dtb" "${DEPLOY_DIR_IMAGE}/" + cp -f "$dtb" "${DEPLOYDIR}/" done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install +python do_copy_boot_files_setscene () { + sstate_setscene(d) +} +addtask do_copy_boot_files_setscene + python do_image_tools() { """Virtual task""" pass From patchwork Thu Feb 23 06:43:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2685 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:40 +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 31N6idU7019209 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Feb 2023 07:44:39 +0100 Received: by mail-wm1-f59.google.com with SMTP id c15-20020a05600c0a4f00b003ddff4b9a40sf3979108wmq.9; Wed, 22 Feb 2023 22:44:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677134674; cv=pass; d=google.com; s=arc-20160816; b=OSNqq3MTpqZLD4YdT71oo1HZOQKNZd26KIWedZgMnKUjcFTASSZFR5+/fOY05y7U+q Pai1dkU+pdnEMwjXd71OmhYd6OgdUijyV5IpZNFmXKxTqZuUi1xySopbDNuMjLsj8CnH hx4ygK3jkcNF6A1QGmMNecLsvyqz3AJnogN+tzvUnaddv7c848YJtDMWziXCjshs6KFD /ikKYfemQGetcc/enKAeO4eARnzVEg2P//fdbCLQ4bDbSilBeUHdG65NSrl/+OBlN1gT NZsHCX0NhIm75a6DA8mWFAGlaONx8nR3ptFS9EKGfq65GjOq7tDRadVm1yZcXN4RWehz hV1A== 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=S18oR87IGZPsOG6zaO0H9qdu6kDvnicKvHQXXH7xUyE=; b=OkipUyIgUMURYlcN6cW/M4hsG87movK5OSgjZwtUH4Q4pTbLYS0SUbyu9XGRBvJzSb 1QPvYHOs269T09Vzx1SM7oA9jf8TqsQXyE7nk3Z8ysn0EgKRxbUyPVCyKyYWn74yhVgk rWeY3CPtYAiDyOUHTmqeckQHLztomhaWp4Ol6DHgfvJO2uTPA5IH1Wah932hm/D7LXG4 gco2UBEhQVqnOjZAxunSHAjVdayKp69CGz8W+/c6ymtvl+wIha/D2IuEsvm1Qk5sMoPp 3NzD4yNchI89GipSpLkWce8rjq7DBBb87BVTZKnUA1RTRWzGtEvXXd3PPJzXa4kCXff+ JgdQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NfLAZxIm; spf=pass (google.com: domain of fm-72506-20230223064432286c00ab689f1d5795-u1qyk5@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230223064432286c00ab689f1d5795-U1qYk5@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=S18oR87IGZPsOG6zaO0H9qdu6kDvnicKvHQXXH7xUyE=; b=WCquoAPxvemW5SfJ2bKSY1NvdM/dnuhGPuyPfz4Cy+Z9YGwn2BnRnMk6fGXTDE7M3L FCgdhxXVfwWp0pvVpkuVytOFb5zI4MHR0eMQzVHxIGnrfmfqQKViJVWCnznTY8xSM444 +v5jQ8WjAu5bRLp9TdlJSJC61ZH+jjRJM/47AOPehehEkLaMZcClXLGQdbl/Cro2zhTd lceVLWnCsuPsaxqBubEoLSHznXV/wR+6Qxs1g1Dvk0+Mav/vtxeZuB0GqmUo6v9t0+n3 rupFJthkXbX6OYAAfsugnATm4fmf5oO3ex0AHMHhDQi8p5NK41B4qXJ6g3yO9sUrEUn3 bvtQ== 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=S18oR87IGZPsOG6zaO0H9qdu6kDvnicKvHQXXH7xUyE=; b=ryP9wvlsY+CD3nAmXiZIJ6I7XLfY02XmLhMOdva00i6j7d+yJaWo3x+/b13XKUkaIY 1WSd382HFUl03OGayOcgItg99HM87eP3twU/bb5QFmBycUcTzsbyhtdkS1rqIP3S681k RtL4YXNOConfwteZBY77Dg6lid0U+GYawNtbkRPp7TpvlhQgUvaIMpTBu+CC9vY3wmGd +dOkrtxNJQW8EB9bLjHeBomJnYXVw+ZBLbX4NOBlfWYIo+fNOjCP1QtD9Xgt99uQ+9ZE puhqXNUKKs6Bt8oL5cauKhwZWjUBUy8rLxrJjuJ4TvsihL+l34ECH1tvzRJZKTRn0sVI eFAA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXAW9U606BXLaF49KFqcJUtt3VlKAIJXjtRnGQaL07Hp7VM2W1J NZcjnuh1l++hoCSWXY1snAs= X-Google-Smtp-Source: AK7set83fHhKoBkpRhGRZRLuFlL5d+RLgTWsPhuPK5wEao1bf1zKArppKVlB0LNpVOCo2hVvw59u3Q== X-Received: by 2002:a05:600c:1d25:b0:3ea:91d9:1f44 with SMTP id l37-20020a05600c1d2500b003ea91d91f44mr83251wms.9.1677134674433; Wed, 22 Feb 2023 22:44:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a3d1:0:b0:2c5:953c:231b with SMTP id m17-20020adfa3d1000000b002c5953c231bls4668473wrb.0.-pod-prod-gmail; Wed, 22 Feb 2023 22:44:32 -0800 (PST) X-Received: by 2002:a5d:4650:0:b0:2c5:c19b:5bcb with SMTP id j16-20020a5d4650000000b002c5c19b5bcbmr9428745wrs.29.1677134672747; Wed, 22 Feb 2023 22:44:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677134672; cv=none; d=google.com; s=arc-20160816; b=cIPOKOZgSd+OzSOfVMPpIb2vAZc6G6PutnzmAT+f44OcnhbT80lHFQgTuNO9cHxaQ1 RXAgIUSTdPTjRBu0bxJP1qsKXMkX1iE+XJ7uu3FlvcY8GGZbD5rfdPWJwF3tGjRZiZkn xAiSY3bbtIueMzxz9Te1CG1gGv/snFRqhjgifCr3oU2XXsQ6TtV9Ahb8fKWX8jy0BW6G goKOX39D5eaDmg0SEMH5jwjLeyoui4Tz8TWI8VOaYXak2UqWFRbCR3z3o5D/7z+/I+wA jcXxncrUxJdyZTxFRolCwgp1PeM6aYs9RsMSwvYmcmDnz7kcuJ91gkMN1ydtA4nSIev0 v6YQ== 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=1zJFqoTuvzRDr5ROGD2imnvHLtHfWath6fLZrq0J7sc=; b=HToBz+G9Or6moyuGK7jcTPQ6pXjiNRTaROId6z3EvOZpCspMwc+q/jyQ6C/VaBBUIF V5RTLOdnxtU53DvsGxax7l7Dq3CqPCySoCvFdeQMmPL6C1WENu83trglpOVo/EKi2Dmz aXUrKMtTqKxQ0v7XrnK1RNupvMXINkvxNz2QHvSF2HiKAuRzTuQ3JXd/zV6YVWBaaK2V c8ZE5DDc2+bPhlQsQ6PxPQ43N2/oNMCWyjXKPdDwTtFkfrk23uYd7uNh4CNR78SynA7q Nzhc6vEvTn1tgyUY9d8LR5cjXkMi+DFV3G65uOLqomRqRakAlsHIgPIi8bMwi2WndAtm w4Zw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NfLAZxIm; spf=pass (google.com: domain of fm-72506-20230223064432286c00ab689f1d5795-u1qyk5@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230223064432286c00ab689f1d5795-U1qYk5@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id bt7-20020a056000080700b002c5995fb581si356192wrb.6.2023.02.22.22.44.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2023 22:44:32 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230223064432286c00ab689f1d5795-u1qyk5@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20230223064432286c00ab689f1d5795 for ; Thu, 23 Feb 2023 07:44:32 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v3 3/3] fix race-cond between default and custom initrd Date: Thu, 23 Feb 2023 06:43:59 +0000 Message-Id: <20230223064359.4171845-4-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=NfLAZxIm; spf=pass (google.com: domain of fm-72506-20230223064432286c00ab689f1d5795-u1qyk5@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-20230223064432286c00ab689f1d5795-U1qYk5@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 fixes a data race happening when building a custom initrd. Previously, both custom and default initrds were deployed to the image deploy dir. The race is fixed by conditionally deploying either the custom or the default one. For that, we introduce a new variable INITRD_DEPLOY_FILE which provides the name of the initrd in the deploy directory. The existing INITRD_IMAGE variable is defaulted to the empty string and used to control if a custom initrd is requrested. Only if this variable is empty, the default one is deployed. Signed-off-by: Felix Moessbauer --- RECIPE-API-CHANGELOG.md | 8 ++++++++ meta/classes/image.bbclass | 20 ++++++++++++-------- scripts/start_vm | 4 ++-- testsuite/start_vm.py | 2 +- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index e48c98c7..1e8dbfc8 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -476,3 +476,11 @@ Bitbake 2.0 for better performance. It also requires isar-sstate script to be migrated to zstd. Mixing old Gzip-based and new ZStandatd-based sstate cache is not recommended and should be avoid for correct compatibility. + +### Working with a custom initramfs + +The existing `INITRD_IMAGE` variable is defaulted to the empty string and used to +control if a custom initrd is requrested. Only if this variable is empty, the +default one is deployed. By that, the variable cannot be used to get the name of +the images initramfs. Instead, the variable `INITRD_DEPLOY_FILE` is provided which +always povides the name of the initrd file (also when the default one is used). diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6277069f..0c29e8b5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -23,7 +23,8 @@ IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" # These variables are used by wic and start_vm KERNEL_IMAGE ?= "${IMAGE_FULLNAME}-${KERNEL_FILE}" -INITRD_IMAGE ?= "${IMAGE_FULLNAME}-initrd.img" +INITRD_IMAGE ?= "" +INITRD_DEPLOY_FILE = "${@ d.getVar('INITRD_IMAGE', True) or '${IMAGE_FULLNAME}-initrd.img'}" # This defines the deployed dtbs for reuse by imagers DTB_FILES ?= "" @@ -353,7 +354,7 @@ EOF # Default kernel, initrd and dtb image deploy paths (inside imager) KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" -INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}" +INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" @@ -370,12 +371,15 @@ do_copy_boot_files() { sudo cat "$kernel" > "${DEPLOYDIR}/${KERNEL_IMAGE}" fi - initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" - if [ ! -f "$initrd" ]; then - initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" - fi - if [ -f "$initrd" ]; then - cp -f "$initrd" '${DEPLOYDIR}/${INITRD_IMAGE}' + if [ -z "${INITRD_IMAGE}" ]; then + # deploy default initrd if no custom one is build + initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" + if [ ! -f "$initrd" ]; then + initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" + fi + if [ -f "$initrd" ]; then + cp -f "$initrd" '${DEPLOYDIR}/${INITRD_DEPLOY_FILE}' + fi fi for file in ${DTB_FILES}; do diff --git a/scripts/start_vm b/scripts/start_vm index 17091d72..8c696a4a 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -125,10 +125,10 @@ case "$IMAGE_FSTYPES" in readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4 eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") - eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") + eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_DEPLOY_FILE=") QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE} QINITRD=/dev/null - [ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE} + [ -n "$INITRD_DEPLOY_FILE" ] && QINITRD=$IMAGE_DIR/${INITRD_DEPLOY_FILE} if [ "$ARCH" = "riscv64" ]; then EXTRA_ARGS="$EXTRA_ARGS -device loader,file=$QKERNEL,addr=0x80200000" QKERNEL="/usr/lib/riscv64-linux-gnu/opensbi/qemu/virt/fw_jump.elf" diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 82ecc17d..ba1ba127 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -35,7 +35,7 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): if image_type == 'ext4': rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4' kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE') - initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE') + initrd_image = get_bitbake_var(bb_output, 'INITRD_DEPLOY_FILE') if not initrd_image: initrd_image = '/dev/null'