From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7351319485919264768 X-Forwarded-Encrypted: i=3; AJvYcCW3JtXF6F9zR6f8ugpYsf4BfKooJaKmwV642NfdjgQkVpwd2jfkj6tlwvw6YlVGdqs0SG8ixcgzEJNdMn4eK7j/VAe1JkqfJCIyWQw= X-Received: by 2002:a05:6870:6387:b0:221:a881:e07a with SMTP id t7-20020a056870638700b00221a881e07amr81100oap.44.1711652746937; Thu, 28 Mar 2024 12:05:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:790d:b0:22a:9d7f:c74 with SMTP id hg13-20020a056870790d00b0022a9d7f0c74ls810080oab.1.-pod-prod-08-us; Thu, 28 Mar 2024 12:05:46 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVVecc4FzWC9nmryd1Nif7frTCEE1CC/Vl5l4mr048tcwhvh2M6GWZ4d0Zj5Qqnd5yiwqV8XDg2C2GXYTM6fZYtK8NkNxMOEe9xW0I= X-Google-Smtp-Source: AGHT+IHEneeaiEqA6KXGwypDeXSrz9lAzKwHViRhiu4atUs8USiHsXxA3T+WA8yVNBM21JEI2xbx X-Received: by 2002:a05:6871:4104:b0:221:42a1:9457 with SMTP id la4-20020a056871410400b0022142a19457mr129343oab.9.1711652745962; Thu, 28 Mar 2024 12:05:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711652745; cv=pass; d=google.com; s=arc-20160816; b=xEv8d1ReMgaoQXMBhY/NLgPrxMoLTxnCl39JniRpZSH+nasSDhBtpuGzl2X5NISAk4 c+vVEVK2jCOOZ4bxNaOpyHHZihPo6aGWyBCjuCKr7JAooXQlyeaL+Zp7Y7XM1feR/xtG Uy1CmASljGcdKs9w49Ng2WEWY6t6je0Hd+/EQqXM5hc0ZzkUKp+xDRRCQm408LmLs5rc t1RQhNldwx0zJpEZBU1sWEOQ++0lpG+ydFsaKrVJlsmMez3WVCsiKKO9ARYkHH6S399N zeXs6snGcfgVD1Cd6zDr6rLsUckSGpfeudW24LG63x1gfifY5CTnGF2gWuQeaG11kQCF zCbw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:msip_labels:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:to:from:dkim-signature; bh=avahxiKcW5oXwUoC/kI/gNbedYw+Bqn/XxzxFAcOocA=; fh=Q7LxutatS/TXRtMZZN66oHJ4tLBqDTE7B7BlJVUVwAk=; b=AOIJdPF1S0dsZ0pEMG7cfpXqh8csZ5D94iFln+zeigS4/17dfo1NSSQHvyGDM3Xnn4 w4eLwqae61j3vzqmjs+On+wZxBcjAIEIJdn6itS6DFbZYanKFcOXxYnCXAQokMoF5V35 6FDk46pOKVaQreYVezMTVxkCM40Ad2JEG14oqkPK2cVeLtbZLCzXzZY1xlMWjqrcLSD3 ASm/EIP38GAi0PSJGgTx8RIZ1WcNjAnL2hYA+CNx/eq9NQBLRcObkYcocGZnqmZpX75D QWmDnuDZx9h5ZQt5ewYhVyAr5iNZA0a9n1kbyycw4m6VNBkEUR0MHd4iYf6ww7czkTX8 rqvA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YvcECCRA; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f400:7e1a::71a as permitted sender) smtp.mailfrom=nicusor.huhulea@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2071a.outbound.protection.outlook.com. [2a01:111:f400:7e1a::71a]) by gmr-mx.google.com with ESMTPS id p8-20020a056870a54800b0022a076681b5si268061oal.5.2024.03.28.12.05.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2024 12:05:45 -0700 (PDT) Received-SPF: pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f400:7e1a::71a as permitted sender) client-ip=2a01:111:f400:7e1a::71a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YvcECCRA; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f400:7e1a::71a as permitted sender) smtp.mailfrom=nicusor.huhulea@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ens4AsQ2Mdo5VzUYfJ4qenp5dRhnN5HtSkyFIzrS5mHslMW6mKs5MSHGdXuW+pD27DqCgs7rPwJoc4T41BSFOpX6FeOcX3kkfj9uCMK5Ovhbm1EqiPZtmWtiQpP2BfTl7t/VqQOATOLp61CxX24UBIF6U5gzukthDJaeqpkhFHcODxdn+OyYXBO059mrxOGhEY3wjRhntmXtDggqlbMPjv/IrCEKzfySF9/3ui7yRwzeYelBdhAX76sA38bMFwj2rMB/Fk12xYfplLeFdEaVpoYuRui1f483trx67OcvNevpZ7eKcTdYxosUAzfAm4zbKOaYrUUpFSCnsmnhdv3VyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=avahxiKcW5oXwUoC/kI/gNbedYw+Bqn/XxzxFAcOocA=; b=NAwl90B64M/pekjeCZy5A9kzk00qfCMPXd6WiY4ItNJywVihzBr1Pivl4r2DG2+zwtdI+0BKmtUMcCpoR2IjTyKhMr0W9Gcp20pnt5GkM/AluuWkywZiYWVFLJ5mWy1v6WW30o+W01BTDgjjJ6V3GZl0xw9GGyOm1yle0FRBIp6IraX5dIeOz+5PkbviyfS9ajoDweGcoYRFCnvnOr19pzJ2Z5Y1EY+1hHLgwOHa58o8grW4KPs/QLwB3E42zIsDpXO6PL7+cRTmsxQm3fwgEt3Ca8bMssDQ5EtdSv4yNN+3Uecmk1DC1/ccnp4+D26KnRJe0Gr4KuEGlNpOVrXBBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=avahxiKcW5oXwUoC/kI/gNbedYw+Bqn/XxzxFAcOocA=; b=YvcECCRAVaapasViNZgou04aCVF6/XJmMJaJuqCaGhaqBaGZy14U7E63wpxSALgHp7pGuPszBCkMZ0jSBIzqNK61DIukKDL+j9mqc77Pjq7iZ/bT2a6QNA08fZ+iJjOG5VtHPpCqku5Oe4RqzXHskPZm8qYG/sEMxvqlz2e7zw010shoAFBOUexdPF6c1tSLoxYIh62fIJrFFaeGU2/q6/xdLCE/n4DTnR0vUVCY8RAAUibORmdm9teOqs42uacB0utLkRwUUzWjy4mCNRfYa8nSea3AjZr+4L7giLz2DmJGm0Bc+RRryxP1gJYzmEl2rdjFNYRdL3EhcQ5m14pWhg== Received: from DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:431::21) by AS5PR10MB8203.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:652::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Thu, 28 Mar 2024 19:05:43 +0000 Received: from DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM ([fe80::224:f99d:c979:4bf5]) by DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM ([fe80::224:f99d:c979:4bf5%4]) with mapi id 15.20.7409.031; Thu, 28 Mar 2024 19:05:43 +0000 From: "nicusor.huhulea@siemens.com" To: "quirin.gylstorff@siemens.com" , "isar-users@googlegroups.com" Subject: Re: [PATCH] image.bbclass: copy dtbs into a deploydir/subdirectory based on the image name Thread-Topic: [PATCH] image.bbclass: copy dtbs into a deploydir/subdirectory based on the image name Thread-Index: AQHagNOW1dRx46VomUipLPKsb6RcOLFNcAyAgAAOLDQ= Date: Thu, 28 Mar 2024 19:05:43 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Enabled=True;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SiteId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SetDate=2024-03-28T19:05:42.788Z;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Name=C1 - Restricted;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_ContentBits=0;MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Method=Standard; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DB3PR10MB6908:EE_|AS5PR10MB8203:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9IBaSz4nLfBLQmpbgvf3MwleXiorH9NPklwnVkk0aT4oK4fAAMCRvs2fYw0iUuv+PnjP+jIdV943inx9DxoPiyAlssZv1n7UQgFbBGOcUpNgy2/SBtgavRYPD2B0Ylsl7t8Nl6gw6dgvnby012Q7kDmR6EfQfg2Sf+f3XuUi3NGQY0JTbaXoarmr0nEFhRNQaWmwRIBRSVq6QBjVh1I8nAWMcZCwYTBiXwEGG3s/Xe+dfODA7OF52t46w+asVcMwHY8rZVWKS8FawLgt8XzXfiBvckgFhGyWL2FWO3SytadSrbFVd9yAOJi6liTwoPCxFK8iJTinitBHpWk+IAwamXu7gL+2vviVtqAF4aKQIKjCLEsF9tdNwMDFIH41cqcFq+LnIsqkhrs9ZYS/AmTfyI/hgBPRcl/iiYyne2kSB2JNRLtXwcTJkpwDK1OqAhKTphHZEt18VXknn/alIJIHohZjZckrkynG5tDjP8I/g+RJjjbtuo2p7HbeXqb1PERlZpVt0FX4s26+6rHmOfEabetEmhxfI4UypOUro1A8MNKcP4f+sri1GHnFOGgHF3MLbOI+C3NuAeAVz6QeQiFAHiFMyGZK/PGKvIdvOEFSU5y8VSy+GFeIZ7S3oCctWQeT x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(366007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?pX1pTAHE1GjOkeF/3FCE5OyK+Yw09cnGq0FiwfIhLGh83uD4Us56ZLaCcPD0?= =?us-ascii?Q?7bYgNPX9CiNqL8YSVtupE4LTUeuIY9RTpAg4ViC6pjX4sfozLdldFpOtPlg5?= =?us-ascii?Q?moPob6lcEPtqsjyMK/popJp5rStvTtnMdxuVezoElBCXCoZ6TnNl+RXwd5rU?= =?us-ascii?Q?fh3rdxlzNfg9sgt+cO6fbRyI/tgONHSkTGLYlWVuzr/qPkCJivt0J8NhmJD7?= =?us-ascii?Q?IuGj/gnhLF2v8xX2FFfTuut1+WftzbpRx4NgfVahq5BpeNlO+4Kxn7UEmBSM?= =?us-ascii?Q?ZyVYFwA9gHQp3GtqgzkkmNf0WriR9kIWq9l0a5yigXGuQKUk4j7iNlojSqPr?= =?us-ascii?Q?eZp/l962f1HXOnQFM9z1r822yKV1pmRZ/uzU/bdMfiP0fZM1yul820iOQdZq?= =?us-ascii?Q?FdQK6TSmN2TVpNQQ2NTRTdpyLzpoLrRD9mXxILH8Gq/ktRmVpLZ8ppcbB82O?= =?us-ascii?Q?CeY36Q50wBZamFpMvml1p5wfLJHswAFFFkXFOMcFl7izuorv8H2FFdndbVVX?= =?us-ascii?Q?rwYYc8viJKk5Jd97X9NJnXfVQ199mnbSQqitO8aFFfx/Z8fjHyHLJnWA/T2h?= =?us-ascii?Q?A9n/q8RO9DLoezzgTRqu4LxSW4fccX4cdtey2IrANI+2uX0gMaAt9KJjMBk9?= =?us-ascii?Q?oXHgd+sCcv3b8pb81Go2KibiqQZ9YkNboBlq1hYiwnr42nnAZ4uy7n8zWe06?= =?us-ascii?Q?MaB2oZcz5eN7eOX8hRlRMRgqUTICcwYPBtzjTcWerH7ZpULk59aVadCeElKv?= =?us-ascii?Q?KaZ/c1TtB/hxKajzMmz6pUHNaC/ipClRF/i+G9K40ccobzQr0pyB7IkT4xe/?= =?us-ascii?Q?7dEb9IASK8VV4OAwULsfvlX6FgCZxPwROsZFpD20KVkadFFNG2kz8CxElOe7?= =?us-ascii?Q?TwDRh4F8Eaz2MqFfXXgbVjvsWH60g733lGNolvSYU9Ku4027u7l64T+LeA1t?= =?us-ascii?Q?C6sXhZytO6BPv43XjI6oi3MgCStS6mk88FQQiE2I4e1EJGRLUNBUsP4Sx7dn?= =?us-ascii?Q?oW/0Yd6N67ayB2FgeyVCyYIjqSeHz8mKk4D2XAPxCsH0xRwMscfmoz+H5dZ1?= =?us-ascii?Q?ClmF7cZQyoek1SNwFMkiuIWnrb+27W/r9JLCu0lXCbzXoPYcqqPPLLHFxFyr?= =?us-ascii?Q?3MMZR8CagEHZjjB7B3CVfhP5/ilwukGrdbWDEgGBVO69nMFEYsXJvArXrUzd?= =?us-ascii?Q?WU6gr3KfBYSGz5oncQTMpRXAMV8MJED51JgGDKfJHVBqr+aP/PLQVItPnD0u?= =?us-ascii?Q?mBrLqOqHj5HvAwDqFfRjcnTwI2P9ijQBiC490qJbHpQGkw+K6je4xfwv/DnL?= =?us-ascii?Q?6g15g6bLtowt8zQI/CMa4iXjrN14zaJpO+Qss4Q83z49nmZ//22LpEyus65R?= =?us-ascii?Q?i7b9BB5E2+VG7fpcIQbozVXbdRota9AG80xNcuBvABpmIFnKKa8/lK2u1gF5?= =?us-ascii?Q?qn7r/Kgk/4n9wrAH1/2+3HSckKDRoTRfc3oMFXu/4TBelwWeTeQigNiA5+A2?= =?us-ascii?Q?4BSCOY9qsYmKlkCAc2nxo+sHQ8BH1/kyo3PlSvDFV+OQyl9uPFvODQYSnxQh?= =?us-ascii?Q?KrelGBrgZl1IqNmPv8Lo/D6qK8yOWlP+eca2JNy5?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 6ed6b742-b5ec-412e-4807-08dc4f5a10fc X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Mar 2024 19:05:43.0200 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: /STpoO5pOPSO95GmQVP05elY844zMQ3sB2UO98ERJ5YsBfMOnPZmxDdIZv+sT3xp2+zoLQx/QdaAP5Wf6jqe/XRBX3KP0JvR5bl36U/Hbvo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR10MB8203 X-TUID: kJWALZ94jgXx Yes, it will break it without patching it. I'm not sure where this bootimg-= efi.py is being used here, as for testing usually I'm using https://github.= com/siemens/meta-iot2050 I guess that in this case the equivalent for bootimg-efi.py is https://gitl= ab.com/cip-project/cip-core/isar-cip-core/-/blob/master/scripts/lib/wic/plu= gins/source/efibootguard-boot.py which is already patched. Nicu ________________________________________ From: Gylstorff, Quirin (T CED OES-DE) Sent: Thursday, March 28, 2024 7:53 PM To: Huhulea, Nicusor Liviu (DI CTO FDS CES LX SVCS); isar-users@googlegroup= s.com Subject: Re: [PATCH] image.bbclass: copy dtbs into a deploydir/subdirectory= based on the image name On 3/28/24 8:54 AM, 'nicusor.huhulea@siemens.com' via isar-users wrote: > This fixes the build failures detailed in the https://groups.google.com/g= /isar-users/c/Va0Ue-ISYeA and > https://groups.google.com/g/isar-users/c/PSGU_AcdPZ8 > This adds the MACHINE variable to WICVARS, hence the need to reflect this= change in > cip-core/scripts/lib/wic/plugins/source/efibootguard-boot.py > > > Signed-off-by: Nicusor Huhulea > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 73f1d52c..9b98719b 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -377,16 +377,19 @@ do_copy_boot_files() { > fi > fi > > - for file in ${DTB_FILES}; do > - dtb=3D"$(find '${IMAGE_ROOTFS}/usr/lib' -type f \ > - -iwholename '*linux-image-*/'${file} | head -1)" > - > - if [ -z "$dtb" -o ! -e "$dtb" ]; then > - die "${file} not found" > - fi > + if [ -n "${DTB_FILES}" ]; then > + mkdir -p "${DEPLOYDIR}/${IMAGE_FULLNAME}.dtbs" > + for file in ${DTB_FILES}; do > + dtb=3D"$(find '${IMAGE_ROOTFS}/usr/lib' -type f \ > + -iwholename '*linux-image-*/'${file} | head -1)" > + > + if [ -z "$dtb" -o ! -e "$dtb" ]; then > + die "${file} not found" > + fi > > - cp -f "$dtb" "${DEPLOYDIR}/" > - done > + cp -f "$dtb" "${DEPLOYDIR}/${IMAGE_FULLNAME}.dtbs" This will break scripts/lib/wic/plugins/source/bootimg-efi.py from bitbake[1]. [1]: https://github.com/openembedded/openembedded-core/blob/master/scripts/lib/w= ic/plugins/source/bootimg-efi.py Quirin > + done > + fi > } > addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_in= stall > > diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetype= s_wic.bbclass > index bce881ed..f0f1c438 100644 > --- a/meta/classes/imagetypes_wic.bbclass > +++ b/meta/classes/imagetypes_wic.bbclass > @@ -107,7 +107,7 @@ WICVARS +=3D "\ > ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGE= T_SYS TRANSLATED_TARGET_ARCH" > > # Isar specific vars used in our plugins > -WICVARS +=3D "DISTRO DISTRO_ARCH" > +WICVARS +=3D "DISTRO DISTRO_ARCH MACHINE" > > python do_rootfs_wicenv () { > wicvars =3D d.getVar('WICVARS') >