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 From patchwork Fri Feb 17 10:01:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2659 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:57 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f61.google.com (mail-wr1-f61.google.com [209.85.221.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31HA1uMX022219 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 11:01:56 +0100 Received: by mail-wr1-f61.google.com with SMTP id s5-20020a5d6a85000000b002bfda39265asf76548wru.13; Fri, 17 Feb 2023 02:01:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676628111; cv=pass; d=google.com; s=arc-20160816; b=TAnnn/FeIQ5vsK+Uvsj+uvtwf/96qaDdmQvDvkH9ZtSXvH6lkRSP1IMxSKW1qHxVEV f3qEc/7SiCUpwMxirkPB7ZT/I2oEyVEn6KCGaLeDyyRAgdPusg52R/Ase2HhZ60WdM7f Ezep9gW2Fgmu9CnN6KrQsWO0IIMSqAoWhJw1LkbJpJlr/sfrWwMRCX3BITqUkSM4vJm5 v/JUWsTzGQFZWsmbGYnYuh5pn4GwMfvVMM6fGJ+wVJZ+6qS558evzwa2ojOOLsTmSuim ZEwjEwyxgFFPFRJmoOsOcdMfpZsxmEzbxNoxHDE3RJuZodwsI5QsFii683gPEJCZtCvw Blog== 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=/lVJpzB8qIT8/igoR9QSzvGTfReJtD7LDCNoxfi3vpQ=; b=FcHU7oYZNeZ01QtSIN7kL1Sn292Ekh3+Y28eDM9g6XVAkFquIoEGCSCpwdNV859cS0 xrqZE1DDebzcum+l4yVvT+4RBIGfo1tIokJXvhaeHQnhPfkpIcN+U3emOe/ukqOFGm4m B/D/n9dB/b/Yx8So/G0iL6aJ1GZWZJdaa3PznzgkbP8bd1GzkgJ96US3kDy+0OSmY2sS 0vk9p71E2r4ZI1vTbwt7a08kdyJNoJ8pzUHD2x3IwGleocmFOzd2b12Ki5RyBvjpb8Bc Vb/6MsnEvCYBoo3hAzMV+L+uEl08K8HYKLHRfJqUdSs3KUH0FEZ+be37ImI03L0IZmAY P7mA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nx24r0UB; spf=pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2023021710014972a10dab83eeefcb46-njmNk_@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=/lVJpzB8qIT8/igoR9QSzvGTfReJtD7LDCNoxfi3vpQ=; b=F618S9CRf+WyhdDPF8+TbvNtX5Y1XcpTSfjaz4lC0Z7spgiWOdQgBtDgmqVmXpDKB2 CO0vpJQWFQPIKJ8kQi80gL4Z2Jt97JituYKqyZ0ywYsfEzf2Jq9qIWdWjcXZ2KX6grnm qqNadh8JkjF3H+87LnaclfonWT+5M3HVas/4kCWLujqBzTKdeILzCa9EkTITPejdZyUH Ayu4MOkcBC+b2Cnnn8CzTGfrj3VqIkhJpPHpWUqpe1hZ/r5isX/Z/Ir7wfhQSoPpf6E6 ZLZ3s4cSEP8i4ZQSBKFIWGPcvDNbjO5pNOaT9fuz9bixKF1ZjiUdcgx9+G8p2t3HL04E qu4w== 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=/lVJpzB8qIT8/igoR9QSzvGTfReJtD7LDCNoxfi3vpQ=; b=ZiMy/c+PrAJkJogajCxdlhnkJpWUFlIoZfetISr9v9IGqI8ydjxYnd0dhETYUDIxXN I70XDEzGkwyC1MAp63fWMjm/hyuqdxrgbbdkqGyLRipTNFs+/UErMZJphOWnsxTwggFm BdB+1g9IbuUgY+dlkzDxyw1O0ymLCAloiCCCfjwDEl5SaWCMsqZl/PWEKi3QVIo5iKAW e5napCucZXE/aYIQaEzL+R6o5ogA7xKJWu8LKTuZBa1foRjr0WxrR4ovYhzn932X3Fzt GAuI9elNHtwpG4RvrAevXwODQ8Ql7qN+VStMvlBBi3uP+moFxSgF7bQq9s3jo7+DoFjr bjsg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKWvR3nFsr3M6umgRyGpqw6B9tOwKsWoAck7o1DkzPfcSyQXNFtG U4PJL7PCAqeWwKL3V2J6lZg= X-Google-Smtp-Source: AK7set/GAtsudkzi3e3IJeIs2sXOc4cjrATO9kOLcX4HCTNXrrFWuGOFLx/lKDzIQLP9k2uXJ/Wm6Q== X-Received: by 2002:a5d:6343:0:b0:2c6:434:c120 with SMTP id b3-20020a5d6343000000b002c60434c120mr97299wrw.306.1676628111212; Fri, 17 Feb 2023 02:01:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a1d7:0:b0:2c5:55ca:3a3b with SMTP id v23-20020adfa1d7000000b002c555ca3a3bls299703wrv.1.-pod-prod-gmail; Fri, 17 Feb 2023 02:01:49 -0800 (PST) X-Received: by 2002:a05:6000:1052:b0:2c5:54a7:363f with SMTP id c18-20020a056000105200b002c554a7363fmr6868357wrx.63.1676628109545; Fri, 17 Feb 2023 02:01:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676628109; cv=none; d=google.com; s=arc-20160816; b=CZe6VZq6sBQcVNuDWACgfJ1qdBjK3+hci2ey4xCN/AWsjoQ7zqmEp6OcWIXeTSZoOA cFh4eBoBboSMeo+JpNd6fH3Fpg+NXZYkmsGToLdhEDATYGCHDWnsaFjGLVqhWe2EODYV j8/F8g9Zp4dn9UggZX6ZnHh7XQe2qTVT0Go5/CWlX5to3RSNCe1y6NJ4WnbNcQ3OJ0gi DrPh6n2JrI17DgvJJtfCqyLkOeM5WYuj9GAbBontfUJVd8QLkH41xTryeZjHYCM4wsXs obxr6hpL07xzism8MGxF4Jh7T5W1X7+sapewZaCKO4ADj/56wFBjSGRNJUnJ7INgV4aC yqGA== 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=dPqW/CWznTAYLYDFvIcCEh0FmqiNcSNT/BUj9bSN4Mc=; b=PaIn1mWW3/pPEt3N/Gb0WmHmXiIP6m+krwc3yvtITMJXSH9qgvtYT1+/6V1UAxYjn/ Jf4/kE13TCJKOQA4SFQ40lmE88uWm+A/vt++LsLtht/+dcOTjXw5xr+nnbmMgoqSbv4R wX2FNt5LgpvuhLPS/Ix/Ux9ApJmvccJBk5KuFRZGEeYwTd3ZgORMAgqk8MrmbpB3riQg JGut/nWPerrTD5dYfHTRF68TcUPfwfxli3bDnDURCSf4vWKusGMguVR7k3nKq4wM3IKY 1MTPMmOJnUQyt1JtSsuWyATNKPm+9RF/0mn1TMJp+5EpXEick7djT3ddQtt6PDul8nZR pdJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nx24r0UB; spf=pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2023021710014972a10dab83eeefcb46-njmNk_@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.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2023 02:01:49 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@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 2023021710014972a10dab83eeefcb46 for ; Fri, 17 Feb 2023 11:01:49 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 2/3] deploy boot files via sstate-cache Date: Fri, 17 Feb 2023 10:01:17 +0000 Message-Id: <20230217100118.2912985-3-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=Nx24r0UB; spf=pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2023021710014972a10dab83eeefcb46-njmNk_@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..e799d1d4 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-${PN}" 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 Fri Feb 17 10:01:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2660 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:02:11 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31HA2AfH022265 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 11:02:10 +0100 Received: by mail-lf1-f64.google.com with SMTP id bi4-20020a0565120e8400b004b8825890a1sf67414lfb.1; Fri, 17 Feb 2023 02:02:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676628124; cv=pass; d=google.com; s=arc-20160816; b=geEe9i59Vr0vF4l0DUegtlhsvd1SaYftNinGzey0w1ZUiD5dBgI6uxlXpmT+54iVPj pISXIILFZ/XjCDCbT74PkXuXtOo2zHWKC+77iPTp4+4b1HA9difK6UyLINBa1Q8KziKW KHjRi/ae2um37c9i+SxhQlAKTLCsFA27cN4wbKS5C50Sx8ks3hC28M/NnAlnMNq3NLGx JvCZRgD8lk3MtfRFHAF89QaNxq24bJDKeqnpRAPMpmZrLfwjA7u8lZ8B9OvpvyztiaKq IIEAYsnKS/c9cC45k2e1d8yyo9XP360OmniGILeTGOD1QsWKrWZsy46LYQoNJNrFe7lj Nb0A== 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=XMDTHpMZQGR1m4p1DOCA1lFbRd4EgHzznTKOR5c4jBI=; b=aDEnP5MaoRPRtjHOdxcE90xzFCs+MdYbgLNOknuQX4jUfQZpQGa/YBJ93BvbNG1coZ uXFzHXTKL73WjIBrvRi3wqiFd6AIHLtSSd4UuGNiMMX2DjxxWx/M7J8JAGd8EIegxR2X gXmZmCB2CgQZyVavKZxHU1XlIRqnVBWn4F8kOLXRim1U8bzATVdstDA1DspABDcETTjA MPKFbmU9RxtPXYBP2YddpJcptshDrT9nL0mLJbjpoquqlQh35mR0sZhbPgbX1nMDI8Lk UcxBGoyUEp3VlTOTN/to7aMIO+uOCRbnCr6XLv8w61pFXfkxDgVOP/KrLW2biCTJ/eZ8 2ESA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=o8YzyNh7; spf=pass (google.com: domain of fm-72506-202302171002009320861578a92192b4-oqce_w@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302171002009320861578a92192b4-OQce_w@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=XMDTHpMZQGR1m4p1DOCA1lFbRd4EgHzznTKOR5c4jBI=; b=gkmh0RjxQaQsVmc2QYt9xsTZXwFq0va+Axq5NH1awxorwsUsCfJmoXlulq0LvsOSyt DAbnlw5R9gf2ym7AiinfdNHeS8iWktgZHAOOWr8L80iw4Tk/zDe6zYDge/0ZQDC3Xgsl Pn6fj7TqgYlo3GA2NecqQ+mtMunuymGiSrPhUB9WnX7B9y+JV4J5PpwFV9AW3SKun4cQ d5HMUj+wrUt66nn+OhbDp/MckTyJkXQVHkp+CGP8AksGQcMY19zuGT3o+db4bXD18mll rjfZeuXh0pObc3lQpQ/jae2BVoTlZr9QCBCwlWuLFSqYX3YVYoXHyMf4S3T9oH/zYPkq R8kA== 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=XMDTHpMZQGR1m4p1DOCA1lFbRd4EgHzznTKOR5c4jBI=; b=bsbP206AFPqpnhA63L3fot2YAYIvPI/8oI8fu7Wsnar8JVRyqSRPw+nlL/G3c/8t7+ /md/XHt2CSxsBZLt3YnX/eMveXwL5CH/Qnk6tpgk31bS/tyAHaf80WSdOaX3X1p2l4EW jqijawJ/ZqJukVI+xAjhGiiOKKWJR4UxGqdF/Gdeg7ysOYCf78tfJi4454Gqd0wWndrV TnbYqC/8HFKIkV3DV18YPknYXglAu9AlkHqa8RNAtQvamfkVYZhKQnKmmxv0K5BxIza1 aoF+IaeEC2yi5iTnY2pT2DjwsLZqXs2d5oL0l1l7xFo01pLOM/NQomITSL5uxG6qskhT 5f8g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKV2uilfnKw8AyluBBTXZrNLaLJuLb4qoxpLUMsYtJDr5Q3L+IZC sQ+WAThh2MJMfo2krM7IlEk= X-Google-Smtp-Source: AK7set/X77ErtVy3rlZnz96OQAy55A/Hef/ka/6AedM+7K9kReGa6GCx1+TOgfQJl8aDQB14qDui3A== X-Received: by 2002:ac2:5221:0:b0:4db:44f9:a641 with SMTP id i1-20020ac25221000000b004db44f9a641mr218693lfl.6.1676628124358; Fri, 17 Feb 2023 02:02:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:b0c:b0:293:186a:1056 with SMTP id b12-20020a05651c0b0c00b00293186a1056ls112163ljr.10.-pod-prod-gmail; Fri, 17 Feb 2023 02:02:02 -0800 (PST) X-Received: by 2002:a05:651c:b20:b0:293:3dd6:89a4 with SMTP id b32-20020a05651c0b2000b002933dd689a4mr4063916ljr.34.1676628122545; Fri, 17 Feb 2023 02:02:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676628122; cv=none; d=google.com; s=arc-20160816; b=E1dCYbH5xLskP5Nx9dlL+efNJORJeA49AvK+RfctEE2Y+mau8Kd6OoN7GN6/zUHhUZ DQ5aBoPzsff9Zhp4ObTIhurpxViHoTQjnZHKJBRne7sFZOKuMD9iJ/LIYjUMW+cz2zK0 PiYn0pU6QeYH+AtHHJ/0+B5O4lGJ0rsX31WyUvMZzccfUxlVkxpZBjiWHVAXt47ddTBW 1eOUhVgfXdWWrboWvWkoqP184hs1xIDWUMbW7S04kGK3iLs+eP8QCMKYkP51XS8pxlMy 0jHsybdz4VyENAq4sfWvYJunSZyPnkcJ6iipMFDuhNvDyLroH8mGfO/S1ABh7QTyigyr QvdQ== 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=FkZyZHXAY3quiF16advfPhb2wh47Rs61jwztLcwkAEc=; b=Vfbw6sgGRjSbBV70yxSEOjeQ+n3H5OrEC/0jHsbnx6sJboAE5bn4Ua9VNP3UMu7EQk tht6S3BBBH3SsfuwzALJ1CKzkPf+zo7NZ3UebzfUlIwZMHKoV67pv+9WdkEbtJ0/jn/5 7fHmSFSnt/x5j9LXdcW5Xyi39CnFNjjI9R1FLWdDoUfpKlwBiqaKE3l0x0C3RcWDupG4 po0TWNmd8fbOFPvQBSYWKJ58+qBOefCctmnmF9DwCNWSjD3x/yssTTLDgCH0G7M6+Xwq 6va+5tL9e1C4jNeG6IarltKnUY/UFRm1xKFJn0krz+WDeZ5vaCbEi29UXTEvcGZSUUCD 83fg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=o8YzyNh7; spf=pass (google.com: domain of fm-72506-202302171002009320861578a92192b4-oqce_w@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302171002009320861578a92192b4-OQce_w@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 o16-20020a05651c051000b0028ffa3d673asi122741ljp.3.2023.02.17.02.02.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2023 02:02:02 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202302171002009320861578a92192b4-oqce_w@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 202302171002009320861578a92192b4 for ; Fri, 17 Feb 2023 11:02:01 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 3/3] fix race-cond between default and custom initrd Date: Fri, 17 Feb 2023 10:01:18 +0000 Message-Id: <20230217100118.2912985-4-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=o8YzyNh7; spf=pass (google.com: domain of fm-72506-202302171002009320861578a92192b4-oqce_w@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202302171002009320861578a92192b4-OQce_w@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 --- meta/classes/image.bbclass | 24 ++++++++++++++---------- scripts/start_vm | 4 ++-- testsuite/start_vm.py | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index e799d1d4..0d5a521e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -3,7 +3,7 @@ # Make workdir and stamps machine-specific without changing common PN target WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" -DEPLOYDIR = "${WORKDIR}/deploy-${PN}" +DEPLOYDIR = "${WORKDIR}/deploy" STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" @@ -22,8 +22,9 @@ IMAGE_INSTALL += "${KERNEL_IMAGE_PKG}" 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" +KERNEL_IMAGE = "${IMAGE_FULLNAME}-${KERNEL_FILE}" +INITRD_IMAGE ?= "" +INITRD_DEPLOY_FILE = "${@d.getVar('INITRD_IMAGE') 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}' + # deploy default initrd if no custom one is build + if [ -e "${INITRD_IMAGE}" ]; then + 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'