From patchwork Sat Feb 18 10:30:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2662 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sat, 18 Feb 2023 11:31:19 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f189.google.com (mail-lj1-f189.google.com [209.85.208.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31IAVFkn026748 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 18 Feb 2023 11:31:16 +0100 Received: by mail-lj1-f189.google.com with SMTP id b25-20020a2e5159000000b002934b9b0d4fsf138650lje.16; Sat, 18 Feb 2023 02:31:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676716270; cv=pass; d=google.com; s=arc-20160816; b=tePa9WyDCq3+irWiwZ4Q3rMlJDIlc+bFpL0fljTEzzRiD1duodaeEDOdGzL8HYxKJD 6SPAsRYjN8AEC2WhvX5d3AYOAwcIUKUlpDGXMKa7BD45P+YDheWtr9ozObyPu8vEtwCo DCBEtGX6wHPo/3sNoSgkLZrkfCq8ZGnc1w7ywKe2kQtRSnJxm175xSX5o3Zfbb54EMF9 nUTJSLeoJKrQdV9G2MPfD2eliny/WBWAsf4SYW7eFmCqkF88Ou7UNIGJQ5/cMT+GmxrH trCfRxHSohSj4ibc9ID8LTZIyaEibAaZs0o4lL5gFomVomf4FDIAiscrbJyJLxR/vVaf jDjA== 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=WuJXz0CWSW7CQDhKUe/qqF3Ezcyp6juypVx3cJfTtCM=; b=QSPrnZ6SG2du/o1T9pr1pvJtknTsoQkt/ETY8eok41wS3EpGpiUK53M6OUIotVFy37 pHsTtUgo/WkrR8qMGThwke7Q7Q+qNcxet6OnCy1jQLFr6KSa7zujo7Xf24vHe4y586fZ sGYFlw+Rq7Q0guq80U6nriX33QQUUrAF5cQpXRu3dE1Tj0GwQKIsz4XACFHtg8Iyy3kI C1sA2sIBPTfJs/zbIO1KFtXzumYCd1MLzUG7xTFYe3c420H1pswngizzXWw/vGskjtUz s3Uoh9s7IthN++e+VUMDIcLKTLTw7U5t3/Is1/ho8xJJI9dy2JkS85v5EWQReBpE9x8A oNYQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RgbO7SRh; spf=pass (google.com: domain of fm-72506-20230218103107d1b7e32fae3b41597a-gqpvis@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103107d1b7e32fae3b41597a-GqPVIs@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=WuJXz0CWSW7CQDhKUe/qqF3Ezcyp6juypVx3cJfTtCM=; b=PqfbcMGLPKPfknjf8/8kiy9McIfE1eZD2G0daSEJSjjKE/bUBNtE5MbHc9Uxsn5nhB ACSisQVg28yAUOK2uPzFkrpWbWZ8+ytOOMrrW8dMSuMUPW93RZ/a6x6+WUmMl89KxrcD 7gIfkPCT/lJv2IoYVljv7/5BRT0UZbRrxRhYnbW46TF1SWja1vRC/697sDssPgtkdAEG QlpEEE2CyJIlwq1UykU78/MJ75FxG00tLskYg9ztiaJvMM/XNv7o8C+Nk/h1+WOu9dBd fiUISqya8VGg6VGbJimSRzbExNE6S4OfjEUzXZFFqlIwa5voltJ/dQfVAiDqYqxkrMfC JBaA== 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=WuJXz0CWSW7CQDhKUe/qqF3Ezcyp6juypVx3cJfTtCM=; b=y9yUtWY6If4j7ZXNC02wa78taL15366g4Z0dgaNwI7HiMAqvabuGL0S4vIGxbC1UQ2 9uWrlmA8hucDPApEaExleIhVYNawvEKiAad6nVY20bjjGCqQE1aiAuekK8yw59iJR7IS 7speTPMrigYuZBmapZTzw3cL3H3yDSoPELX6jr3CZN9yqlGrR20nKGkrMGqcaZeHqbuj a/bASk+Ao3lmwX1/gBs9+WzjZcg8C5rEMUr95DegJduPM5Z34qQP0BZR5/mmpxYsdOoT V1kYCmduwjCXfgvPth7K26PGCW7kJjPqUrmrHATRcWDJ+rn7rQ8FBUmvAxOcieba612k P9Zg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKWGupYCgkDZuFe7AyzN7Xrew2wEIDSMVzkdfnx9j3j8A9anFTbv Ef1alojEB1qQsuyE6LRabo0= X-Google-Smtp-Source: AK7set/7kYgdnUCplKFaZwHOqYRYlb0dtCf//+Egbpslz3A76u+36E+B89KxdeCaukreAujJXjrKPA== X-Received: by 2002:ac2:5388:0:b0:4db:5133:59a6 with SMTP id g8-20020ac25388000000b004db513359a6mr1303037lfh.13.1676716269788; Sat, 18 Feb 2023 02:31:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b91:b0:4db:51a5:d2e8 with SMTP id g17-20020a0565123b9100b004db51a5d2e8ls146807lfv.2.-pod-prod-gmail; Sat, 18 Feb 2023 02:31:07 -0800 (PST) X-Received: by 2002:ac2:5550:0:b0:4d5:acb3:fd24 with SMTP id l16-20020ac25550000000b004d5acb3fd24mr1123748lfk.54.1676716267918; Sat, 18 Feb 2023 02:31:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676716267; cv=none; d=google.com; s=arc-20160816; b=jk9Fh29iIuNqD/SHgqNseclzGadEWKjZNaA+VJHiE3OCUSP/l2jFh9QlM0eO8yDYg0 +GJCFidIP/oKRoC/QHsPahHstIs2mISuzSnVV3WmC1IjbkrUbkZFk+gOlzEplh35SU/L eRA3CMHKofXnQrQ5CflBmbbPhQPG/JqaQYaPH2x9XSPbCoiY+g/easqKvnVwgMgsor6G mRh2UPGItVkWdLgtJVUYyka5qaiaczEiGAXk3HjzCFg7Dc2unKqCvI79RcDa/f+/RP/L AvSKluUPpBxpDLXaVcZqUB1ZH2TK93pPTU95RbMD9S+6Tvb2NKveMzbdo+r7d8ab7iKw FyVQ== 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=x5K4KVWgDRt07z6BoTUEN5qFVDwNa7jPOHtBy5MZvIClqAWkkFRONdC7/Skkr3g84e SJaVwiKKPA1yuSxfV59sNjvCbLZ6Hm1kPf17cYbjbvawpXTAEv8I2RadCLpr6FpUha3D 40OF3Bdqz+7L2X10js9czcG9yAaZ0CU3gv1nEAAWYU7PTM+gpFMvwqaEA7Gc9cTdJI5p /N/x/dXJW0Ztm5BFxwfyW+YpYBt+lFxstwPPWgb5C/rAK4OOCZbKyxw5B4akJP3utlQW H6LxracHE/hNfE2ZJz+LmCKNsfI7TcxXpQ5MQeAP1HszIxwXQ7lEuhojGlHMc06jZ5M3 rN5w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RgbO7SRh; spf=pass (google.com: domain of fm-72506-20230218103107d1b7e32fae3b41597a-gqpvis@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103107d1b7e32fae3b41597a-GqPVIs@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id t22-20020a199116000000b004d5786b729esi249835lfd.9.2023.02.18.02.31.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2023 02:31:07 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230218103107d1b7e32fae3b41597a-gqpvis@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230218103107d1b7e32fae3b41597a for ; Sat, 18 Feb 2023 11:31:07 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 1/3] add initramfs to sstate-cache Date: Sat, 18 Feb 2023 10:30:36 +0000 Message-Id: <20230218103038.3005105-2-felix.moessbauer@siemens.com> In-Reply-To: <20230218103038.3005105-1-felix.moessbauer@siemens.com> References: <20230218103038.3005105-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=RgbO7SRh; spf=pass (google.com: domain of fm-72506-20230218103107d1b7e32fae3b41597a-gqpvis@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103107d1b7e32fae3b41597a-GqPVIs@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.8 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,T_SPF_HELO_TEMPERROR 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 Sat Feb 18 10:30:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2661 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sat, 18 Feb 2023 11:31:17 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f184.google.com (mail-lj1-f184.google.com [209.85.208.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31IAVGcU026750 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 18 Feb 2023 11:31:16 +0100 Received: by mail-lj1-f184.google.com with SMTP id q125-20020a2e2a83000000b002945ecef4b3sf136895ljq.14; Sat, 18 Feb 2023 02:31:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676716271; cv=pass; d=google.com; s=arc-20160816; b=Irr6PEfzBz1pMcfoc9LVRm5n22h5z3MwzGsBvx5l6NuxzFHMk9+o5UKwn6E4vCTTMy 30nZd1tvlqippCNrti99LY4KAs4G8j2adJzpt+5MTh316oSCvr0ZRVw7BBI9gnhv6as9 4iuzbhOze1t4auJDTT4d0ah5x9Nt8aExIXN8mVAqD4DELWNBuvAPyLmON1GTHa+/Xhko HNNwzaWR3rE8yQSlNmR3w3QTY7CIFITLCFODXyEGh3nI4ZH4DBAr5Ry7ynheNokSj2Sc KYfKtucUq2tvxibctC58bgp2z0onOWhaGVPJnwNZEEkAVZ9Vtd4/0J+Nf2dW5yJsIzIL kb2g== 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=3BHe9iLrAub3POdLvwg99nC9REjd3gsCbJ0nzxX1tDo=; b=Ok0MwGmnIIb+wiQB0TzI8Eh0ZAhrU2Tc0qdRzqPpS/JYnOXy7l7VM7FqA91hRjcag6 o3uBC5jyQljEXWtJYNhKzUZiy8VT8H2qIiJyKo3IR8pyILIGWIsxRcbGqhzuaTPNm+xF /GYJzCmynYRTMZadCPhTXn6911aKWVrrVuZfDUv1SQhQ3VdpZcbmL4mvFP915St9SFsh t+O9RlI+ObpiK1oaMzwTIo4J06nZKliABapI5bSIl6s+8UlW3B9VEmaF2Yet3JMRpAvz KghiS4fG7MaFTASAw0EYQboTOYXbG4RaVylcj8R2bD5AtUS4wbkK4eR+XBzanH70IfgJ 1Rqw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=AID4XIjp; spf=pass (google.com: domain of fm-72506-20230218103109ef013ba5146627c117-f_tdzy@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103109ef013ba5146627c117-f_TdZy@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=3BHe9iLrAub3POdLvwg99nC9REjd3gsCbJ0nzxX1tDo=; b=TvJmXe1zTB5Hi8WaJcxfQ2WjYgCPLonL5NiIzEPvsgHbP46+C5EFz5dev4d+j7TMhg J35avBzWFmSQ8IQTTHN7gYZwjqos3Nzx9BN7b83SGbXQMdYzeOj8AjJeEslkWESdv2UE GXEs80Mo5bmhNCGDwQ4Dbf/24LV8qFU9sxRZbflTCNCmku6w8jQOLbP19UKNL9x9XCkJ ypwVqUxFGpsc+cXOwzqObb4ZMrzIwVSyfxCkVs/D3v9de9DJTTh4ZSCxosYNdk/L3Rij rCMOkD0NHz0RGyAEcPiZ+/laiV04Y2tpWXx4QcIEMhEWqJZlTReY0UDjly8LQHBGNBE3 FoeQ== 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=3BHe9iLrAub3POdLvwg99nC9REjd3gsCbJ0nzxX1tDo=; b=PYaw/tIRmBQsyKSHngkHi6Da5Ed4tDm2xs0mGVCsb/TTBEO3uBHl44Q1V0znzIjdz/ QVL6+6yjr38EDmMwutapKF3Y5QakR5h400wBIRPG4DMEt7JJWFgKeaUZP0gfTW8KNNmE d4uPR1XglSbMSOPZMfRVEWuLaSPzdNqne74cgihfNkRXvJoAgBC7VgRri8B7/qij2BGH D9QRf3osf86V/Q8KrOTffG5knySxhjUp1+WBzpSr3X83dxrwJYP6DLxHcNrqFkf39grp Qc12bJYLeRel6Ekau3y2QkTUEg79R7AZgSL/iv+c2pD3YzkJ9KiPR0JNAxgOJ8QJjr5y l9lA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKUM5lf07cqLgQgGSzEFAXLACMt+N5t4gldr8V0PF/89DinUTYtK AVfQ6FNZs89WaYOP5SpOnjY= X-Google-Smtp-Source: AK7set8BSeIAMu2DHFf2GQ76HtJ2/dKcYzadCxgmrKmIsnvr3ASy0q95rh0r8qIALNll2UWbzf5xvg== X-Received: by 2002:ac2:43a9:0:b0:4d9:8773:7d74 with SMTP id t9-20020ac243a9000000b004d987737d74mr1199689lfl.6.1676716271163; Sat, 18 Feb 2023 02:31:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:398c:b0:4db:5081:6ce7 with SMTP id j12-20020a056512398c00b004db50816ce7ls146306lfu.1.-pod-prod-gmail; Sat, 18 Feb 2023 02:31:09 -0800 (PST) X-Received: by 2002:ac2:5225:0:b0:4d5:8114:3fdf with SMTP id i5-20020ac25225000000b004d581143fdfmr1144822lfl.27.1676716269421; Sat, 18 Feb 2023 02:31:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676716269; cv=none; d=google.com; s=arc-20160816; b=CEZyhaLkWQi/xcynQoZJzvzfDsVKyo/BhQdPc+6hgq8zsxmfX9vpj0DHsoGepP781V Gp0F9vTt85dDz/pe8Ju0aUgad9BoUXva6y58VumNo9OqEbWPeEJYHyNwIVouxmcmGz04 k9e0HydEvwmkJawTXGVjN9I4lpHxethxPgZmpVrOgM2BTwvkprW+uvB/xdBkdPDVOhVz 5N+aSg+Cv8HLE6b99vzlwJflIwA+uB0t8De/jgruiM8IU2IedU98qoFbcoNIGehHBQ6s akwUUcI+gSMT26KuUB3TpFEUmUk5knKt01aJXkpXvm3GcbAWC8MqlNk4kc0vR1R9Ukmc eLyw== 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=Bx72ahW+H2SfIazLTKcJURauBNC4UUFYgKMm4XstNRYv9rB9DruzT4rJREFT2GvoK6 LI8FbvISwz4PSyzL67N26wetr94y7eFnGvctWLyF+fb8NJEUCJJHXLdIkmlfM+BJHQlo j0me/NsCXRU3oSOTVv9XcR+FSNPphzil4UHOxydvdcoM7eIwlsU3Vm0EpQ4O/YGMaJau n7yOCReTapNGnYouw34AsmuZ6vPdhrFQ6/UhWV/6AHwr1lidGgtOv0qcjJ31pIsBzlpd qBrjwS5W/jONstg1AGvOJWvdYlb6I0Fmn8kLwanMN4xP3rClFkQXB+vpKqj3RPWddEdk 3CLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=AID4XIjp; spf=pass (google.com: domain of fm-72506-20230218103109ef013ba5146627c117-f_tdzy@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103109ef013ba5146627c117-f_TdZy@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id t22-20020a199116000000b004d5786b729esi249835lfd.9.2023.02.18.02.31.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2023 02:31:09 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230218103109ef013ba5146627c117-f_tdzy@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230218103109ef013ba5146627c117 for ; Sat, 18 Feb 2023 11:31:09 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 2/3] deploy boot files via sstate-cache Date: Sat, 18 Feb 2023 10:30:37 +0000 Message-Id: <20230218103038.3005105-3-felix.moessbauer@siemens.com> In-Reply-To: <20230218103038.3005105-1-felix.moessbauer@siemens.com> References: <20230218103038.3005105-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=AID4XIjp; spf=pass (google.com: domain of fm-72506-20230218103109ef013ba5146627c117-f_tdzy@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103109ef013ba5146627c117-f_TdZy@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 Sat Feb 18 10:30:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2663 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sat, 18 Feb 2023 11:31:31 +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 31IAVU3t026798 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 18 Feb 2023 11:31:30 +0100 Received: by mail-wm1-f62.google.com with SMTP id v12-20020a05600c444c00b003deaf780ab6sf416230wmn.4; Sat, 18 Feb 2023 02:31:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676716285; cv=pass; d=google.com; s=arc-20160816; b=wtWW5WjSB2W8LhFIGaXzQUkIdeaKFMXaQ/+WcidrlZGaDan04+bFkgeg36nWspTRjB lXccvaZD0b34E0BJq3ot7WOd9Xj9vjyOzua6aMDT7soWX5HXZak5beiVbAniNLWCuY5j X43cie2mR+QDhwMUoSiJlvxrfMdIpQ6IT8s6sbBbrCtLKB2el+OOZ/7KoQaKAq/aytaZ A6SIXJD+FMGImZLb6az1djuUvPqF37nn+B0HYSYoMTojJghcJUidiJGyTa09Ocg0skoP pWFFO1oQfaZds9kQpmvWaGmMR72MIhnjzirHBGQvGhC5byFOo0tpPHasYAcGNIo+zkDG y4Xw== 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=wRcSTRou2skguHnbOWM8J+Q4TlUIIvHdgtwFZdBipac=; b=RQKlNb5KfS0kLtVDpfDtYJuh3B2oMcurlBo2iD77NEcOaaSAxQ7RuWkP7hk7JQzYgO PIoKo9jwkZldvQ0N07cZFvxJYx9emGSIxYxzYBsFi7sdG12oVbKcmwSWRRvUnMk+A3Vs 5S1aXqDEiA9ulAnXngH9pSfXXrW93CYBdyEtRFY80Ya4l5J3rE119HK+ZcXHYI0RwJCf vCZnRB6vExSfDeXr+372VYgoiQWdn5uf3+MDc0HmsKNl/na1/1Fk4SsPOjrN/Z3AWN2F ureYs83MycwnJQitqHzyrzQz9tXH5NtECTfB2SiUeY3ZdMtMEpIr078JLKvUoQ1jbDls yTuw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QQHMAscp; spf=pass (google.com: domain of fm-72506-2023021810312037453e37ae02c12cc8-nbkvd2@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-2023021810312037453e37ae02c12cc8-nBkVd2@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=wRcSTRou2skguHnbOWM8J+Q4TlUIIvHdgtwFZdBipac=; b=TFwTwwN9rX/DanBJOc/AwovuOy429Fg+b7e1/eHaOsyekhEFDtKBzjZSOogK9JjPLG g/ZEH55FDlB4VGojxShxEB4tDOozrLgbiMN0dhIiVyylA4uSDG1QA/E9anqrbK1OwTCu eq/Ya45rtMOUiaF2OomrIYudOOXH40k58LnXv3upOHdymjoj7AW/icWW7bpCk1eaHsaC i6MvNONRLrWsQ/SHKMf5SJQA7jX+CtojaVqAeghvAhNrJsVKdoPQjpy/aToO8Fk3u8ar D5/qT7tR8ZqhVJEzlIbS4+sSvcNnG/zq2szaDJKEuRhaZAOfAqFqLlQFszqWi1SpgExp r8Cw== 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=wRcSTRou2skguHnbOWM8J+Q4TlUIIvHdgtwFZdBipac=; b=iNyAOpQXtfKTGQfVC7eRGvMLuHBroxTAIGrvLz93lYMkmT2oPDTezKk4pmmo9tzUH0 8o6gdxoJsThtLLGs4/cvwSHHApRFrphzBR520nfaY/+bHlAMbSvLTOpAJR5/lKHK8XQz J7jaKqYEaG7aLSgXp2RFHXcwZ5INSxQuiIrebGwb5oEykAWvM7LThkp3oMe4B0znsg3a dBtK6CJAjw4gUOeHNrmv/TDoNZSck7iNstG8dkRkey2DKbeLvwU0b5z7y+Wd++3doTSr 265yAwsOEbmh87fmMS1rTd08CyFVssffaftF3L/fsNvHDvZPdF3riuB6/73Er9ziVxsL a2JQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXnkACaaMiXiyiIGmweDMaP9p1/SkQrqNWwAxLUHHyJFmroOlMO uxGCUfS1QQJCM4SQy8rbwNI= X-Google-Smtp-Source: AK7set9eM0OMY/zt6ijkKWZX8za5Vp2IGJMAUgugCigpnabexD2eaey31l3XkBVhxQrxBIMUVjBJxA== X-Received: by 2002:a05:600c:1c0d:b0:3e2:905:9435 with SMTP id j13-20020a05600c1c0d00b003e209059435mr929677wms.2.1676716284877; Sat, 18 Feb 2023 02:31:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:64a9:0:b0:2c5:5262:2e24 with SMTP id m9-20020a5d64a9000000b002c552622e24ls222835wrp.2.-pod-prod-gmail; Sat, 18 Feb 2023 02:31:22 -0800 (PST) X-Received: by 2002:a5d:4a08:0:b0:2c5:6046:aad6 with SMTP id m8-20020a5d4a08000000b002c56046aad6mr1292887wrq.23.1676716282200; Sat, 18 Feb 2023 02:31:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676716282; cv=none; d=google.com; s=arc-20160816; b=GIv3jkc5osr7/vxr4lUoKmuQ3L46du5nMoNdqT7M60YGMJ1eZCprPk1yHMAjX3TWrl Ff6F5hn9k54gPOH2ut59QMv3s4CXAbl6ktLR9S7zT80IfGqyCpXWnx9EBKwllKaSGEqC Xknh7q+krb3GWRVY8FyWyM1zkY1WJryUVQ6V4ZoRNDoi+9APo8wnlipEfHHtl2LakIvh eH3hFwaPBhsYMcgv8tCO3CVAwbHOqKN2TypCmF7VMmEBFjHZz4TyP+z4IShK6ju+aifh nhPfn7+uPFWalaQWlrrWgFhFJvtU7uXSFLhULQRAwViamC/QhdgcovmNOr/rgoKRjz16 aq7w== 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=QY+vCLb9H9T4b/YOVoOYiqAxcbwGZuitdUHKJDO54a4=; b=avB3u8xlRB1U5/67KXpMmLywKdyKP0QZfJZimTADxk2YmY/VdaEDiIex6WS+Kn2t3l byffu16GabJ0Wz+qdyFq6Rw/45ceo8yHKiCgCI+gF5Astdmr50zfyFc0DiYjw12e3bwY 8I26BtmQ8/doSgzZ18kqIrGSiyby80Ymeh7ZwZADbliL0gnYGXkTnDuUdAOSm9DOG1j6 4y2hurDP7nPT63lDykjH3BeUWttQKCS7uSv0MmIgRIbfrol1VF/GO9ePyP48HID0Kb+k HOQ2ZH++oWFgMY9T/3jp9/dWMVLqTzIw+JG8+ddTohDVbk0rziLto/RyGc4gA/mpYzZT EtuQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QQHMAscp; spf=pass (google.com: domain of fm-72506-2023021810312037453e37ae02c12cc8-nbkvd2@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-2023021810312037453e37ae02c12cc8-nBkVd2@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 az19-20020a05600c601300b003e21b96f27asi188502wmb.2.2023.02.18.02.31.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2023 02:31:22 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-2023021810312037453e37ae02c12cc8-nbkvd2@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 2023021810312037453e37ae02c12cc8 for ; Sat, 18 Feb 2023 11:31:21 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 3/3] fix race-cond between default and custom initrd Date: Sat, 18 Feb 2023 10:30:38 +0000 Message-Id: <20230218103038.3005105-4-felix.moessbauer@siemens.com> In-Reply-To: <20230218103038.3005105-1-felix.moessbauer@siemens.com> References: <20230218103038.3005105-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=QQHMAscp; spf=pass (google.com: domain of fm-72506-2023021810312037453e37ae02c12cc8-nbkvd2@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-2023021810312037453e37ae02c12cc8-nBkVd2@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..7b3551b0 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 [ -e "${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'