From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7351319485919264768 X-Received: by 2002:a05:6870:fbab:b0:22a:55bd:a02e with SMTP id kv43-20020a056870fbab00b0022a55bda02emr2212826oab.42.1711612447744; Thu, 28 Mar 2024 00:54:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6871:430d:b0:229:eefd:98d5 with SMTP id lu13-20020a056871430d00b00229eefd98d5ls979918oab.2.-pod-prod-07-us; Thu, 28 Mar 2024 00:54:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/oD7QBQwr87+1OVte+0mKavQP7oAcX4wuuKG+W+4J8kvhoHdMdWInVtzJtRRnMDAXgoYK X-Received: by 2002:a05:6870:64ab:b0:22a:8e35:2816 with SMTP id cz43-20020a05687064ab00b0022a8e352816mr2170073oab.30.1711612446692; Thu, 28 Mar 2024 00:54:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711612446; cv=pass; d=google.com; s=arc-20160816; b=s3cLmaO203H9a/OAppI1gYgFCrKTZf+wQJRENwwqDJWN/E8oL8Yc3/jp7Cahx0AwTD iQ1LZbTFx+4S64L8NW2MaF//v57FcUjMfAf1M1ooiCBLQxN2KaEbfX9uM/KANWZEuetr DmFlez2Iw+i7J6N5dYvc+V2kqmTCtBvOzeek8ONTAHuEhVlwV4/1GONOg/bNLmUZXN7W h/WVeg0nfayirrKoT1kj1gsXJA1rkwlmVbBcVUDFSnRo6BwKAy5Xlpx7iS9O1n+3pGb5 R4ZxcNgVtOQSNoLegOtfM/MZj/99Y8LNQVStMgVAiOxhCYFxcwlyxqNwtROM8HbVO40H nZrg== 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:message-id:date:thread-index:thread-topic:subject :to:from:dkim-signature; bh=7CHoq8WmliEbkaz4Lno3zwBEwE5tCYpOLI2saEk3/lA=; fh=OCLipNJhBAjuYZVWe88RgIbTd+C/BiXjPppf4/h0OyA=; b=Lccd6buBHQGDejv/K/s5hAvkQxMsYLpGlHceU78LrwCFAxU78qHRML3ZxnfaBWgB+T 5ymm70OmTTWpL/pzL4ahRJTqbZgrAdG030LhgwQHNmFiO+U/tSq4JjGHTJYdUlW32Kjp 0rneEX7BOjfxDgfhryWn55dNtJlv85Xiky4dRx6LJyRO8C3DrgYVNhaiymlpDChxZWly dcPjTjuEJLdD+QnbeNjCg3tIBuWhBobhfXCD0laU8vzm214tKs2GkFfLZUIY/HmHkKwf FSgvJyynkF/hlQIeZsg4lIV5dGqBSuuM61fJgV3zF17Eqd6IDIpamoocN9SXT+xE3vjc B3mQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EuBzUC0n; 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:f403:2613::601 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20601.outbound.protection.outlook.com. [2a01:111:f403:2613::601]) by gmr-mx.google.com with ESMTPS id lg20-20020a0568700b9400b0022aa7184b24si70253oab.0.2024.03.28.00.54.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2024 00:54:06 -0700 (PDT) Received-SPF: pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f403:2613::601 as permitted sender) client-ip=2a01:111:f403:2613::601; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EuBzUC0n; 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:f403:2613::601 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=duIoxg2Nf9Kl6oWR/F9rUq0pMimSPJ5qMDVtq5/dzz/9sC4LnkoO7f9tZVkB88v7L2Gxen22TL5kgeRBifH9DzdzVux3SmWik+CDdjbbEBgq2UjY/+K3hoPmkaSGkFCjfybTJqAgKeduI3asAp6RK4oXoB5bh1oYNI1bfCusFapo5d3p2bBeUl3cqzFZO0d7Uuc8cV1fILXgdBL26yNz/e/5iMIrMOQL3FF6uQUW8x1W0DfNiq611NV+mVveR8BmVzmvgK21WIVmLDs8XOmxHeaOANseT9ga1K2r8cn8Uzy8OP8En3t9WaWYRyDXPmjFpMSVdQhDU+0z9G32thXB+Q== 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=7CHoq8WmliEbkaz4Lno3zwBEwE5tCYpOLI2saEk3/lA=; b=SFtwAocPpG/Z114yjKJvvE8WugtyxT1T7RfVpphTNqUtTfdllZo+PWbJyqWqqxr4F/6gHq0UoE0egj0KhyqGxdLm4zl/l1WMyZhsCK8H8xwFoL8ZyEzrGIbfs+01QHeC/i/GmPkfz4VY1R1pFm4d1LmqST5BPtdxlXQjGY07EwqXz7rs4EesE3UkRR6y2m1WR5+8sglR3KmTpSEqrLfHCzvsxJReofCom+T+JgjuOQV5pMYSwLPbyPZ6ViJtfX2GNSW6YbLVpi2xd5BthFpjJWecelTQqrvCTsxVQZYk+GSNS30OS2oPJ54dVOD2mfVvr2lYiNPGr8zRC+l7KxijNA== 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=7CHoq8WmliEbkaz4Lno3zwBEwE5tCYpOLI2saEk3/lA=; b=EuBzUC0nxM4RO5SprfcCh/NvYI5mjIbxTK0+7FOdB+j+pD325IFuHRDiXFlKUDCZ+1RJlzUMhCs3Nmxez9rXfr0bB7ox+FzOR3V+RE5rToySgyaOm+p/bMdGcAJb+WRZVbZmFCDfuhxrzWnFE+17TMKFk2T4KJoATlpYfZaTEx74CJiZ3C9RfVWBIF+XpeucXiGokRQETjOJ/5EQT1ZRuSu94RK2SkxX03ocLKb6936ulk+rxg+inc2kzIp0vrx6zcTJYgrxkAqGinYjB0v52A16gcwUPDS5/oBRNaNKzwa7bwUvbz262nRock4YY8PSqX3jOLND7jJ5n/do43Q6dw== Received: from DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:431::21) by AS4PR10MB5548.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4ce::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Thu, 28 Mar 2024 07:54:02 +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 07:54:02 +0000 From: "nicusor.huhulea@siemens.com" To: "isar-users@googlegroups.com" Subject: [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: AQHagNOW1dRx46VomUipLPKsb6RcOA== Date: Thu, 28 Mar 2024 07:54:02 +0000 Message-ID: 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-28T07:54:05.359Z;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; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DB3PR10MB6908:EE_|AS4PR10MB5548:EE_ x-ms-office365-filtering-correlation-id: c3e12844-4a0b-4b8e-0fbc-08dc4efc3c33 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pMFOsRTl7hF585tP8dSud1KzTdQ9/KNqfdFJkx5vq5eN5WX3ANcaawRgYWWu7lMjFgAAZeXaj4kEtpvfNoAht6OIThsGQTH0l1IeIX8WoluW2+0wFd8E4HYipHngmby41O8WT/icASLVOWde35Z2Hgwn8nQCJ2V+gtDE4caO/KGO5vnk4lidceHNtwyxnFDn1HCsbl6TjczXtCSxXJD5RJSCX3dOwRcOKl++1oLocRLJhQCj+k0gDejRvkBi1NshqDr9nbm72Lv7E2vTsyEMEV9XlBF+T2jkQn+TmywiW0jx8Te8ygbDUmQz/4HyZsgDEITdGS9QP7rfbNGkUoZkljdfZOULD8FDpOMq6p/RIezFFn+Xv+WMHcmEZaqsiwfz5yw0hIwGBOrhnIVn6/Obarv/jykB+CR1N0o95T8A1ZhiAcNoiORgV4J28GC1VNGg2Kfr+b59aMwjmTWCxew7eXu5iAw5G8cNiIDfwxNAUstNH4MAmVBiUd6EESMP/R5IQQX5Tvefc2+6lc45yIaBvhGdr4QPfhBOprtgFhejwIrixJnbGHy1p50m2mQi3Ka76YnK25xoB9gDvcVUm5wkJfvbE1ulcjZL7Nb1E03VAuq+X8feyEJgkZL+dAqziOfnf/k/lE6v5kKPi0a73ebcVR6KpBm4zNYfA87fRmLHlo4= 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)(366007)(376005)(1800799015)(38070700009);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?IZTLJ1lzwQXO0h03eNP7tpHpSsxYDEr+DkMn/nMA4MCD5caf2acSRLgnym?= =?iso-8859-1?Q?l4124dxeSEgjNyHtRGy/P6V4DdNwfZBoFr80fh5Sv45OyGgO5n1K4KCRcs?= =?iso-8859-1?Q?4M/8qUHVHPf545GF8nj1MawyhwPiYbQJF2J6XLRXqZ3jha0T7YdigMWWyw?= =?iso-8859-1?Q?M3x/1AyRKjrbgKhsOkMtljP3nw5kuW8z1sYo0yIChSd0Yk26Oymf33PKUK?= =?iso-8859-1?Q?xl96VICLzbc8EUQv6Qn5yws4k7pNsisoZbi9UzRRb3jyrX7tJYgxQWoVgq?= =?iso-8859-1?Q?zwOfjUHmnlVMM2Rscam2nLZqeQjFAhwzjqTCMz89+ktXMt8RHZso9oryGC?= =?iso-8859-1?Q?IiT3OLXjbjwGxkcXbaX2KmXPs98Q9KKOVrQ7LnB6m6jL1JA1JFDvH1u7lI?= =?iso-8859-1?Q?cmKHk7PFWeC7ZCCMOkhDGPPaLcm+0hQJamhAnS5ODu9hYsMrFBUprI7rQg?= =?iso-8859-1?Q?KagUrJhGmv8uqP19gn11FBDxuCkiXCW1T89EzVkVnNuSAnR5YQXM8u6/Ew?= =?iso-8859-1?Q?GOs3avjPgCGRf7aWz0J1TOq8DSlk+38wmYnK6q4qAZ7yMrR6fAHuAAow3D?= =?iso-8859-1?Q?h4xG7RPl1GI+teMfSjMQyvdXpKHpoT3oClb4Tt9ctLSSsEHuzMmqUSP2qE?= =?iso-8859-1?Q?53wPtcYLoERdrEncwEtrKxTJ8WUjCqxv0sxGPi1bEq01HtgSVjEKNYHlB2?= =?iso-8859-1?Q?80GO7lIpbrQ1kEqsPHj2OtxkcwFlnxaY/SAUd6LHexkjbW+DC7spo87YUg?= =?iso-8859-1?Q?gEM+bsv7XvGuLW4RvCmh1N1O89xl1ae9KzoYZNN0WeM8aeS/giN//qfH2/?= =?iso-8859-1?Q?038+8+8LYfP6Zk7pG4PvzccstAsBskRjsGbsSVHn473w3xda4sUglWTjUG?= =?iso-8859-1?Q?+kPQ/zhKVamHf3VoX/neGlRUQvW93wUhggTEQziDY5WQmym12YQLNfov67?= =?iso-8859-1?Q?McsLUoboF5l3ZEwcgbbRZbXSX8FFwnZAakkynlQzU/fl+lRq53gnrNTUgX?= =?iso-8859-1?Q?ecnOBKpUZ6VyaVlYT69+axB60cUQb0eC+Y+mvwEeTz0i89SWe4onLdVnP9?= =?iso-8859-1?Q?fREH21+bgRtYsXnDvWl838GL/h7ZjMKOcsEccXDGTiA8imwyQfNA1yMmRF?= =?iso-8859-1?Q?Jddr1mei6d78nSUt1AdTKgB9krjhXhshOw0UG6M7Q4RZSVN0DOt1JZq3Xq?= =?iso-8859-1?Q?ISAMSyagodC5JGbcdGhTLeXjEgGJppvz67liCqXY7gWvCoqar7UnHUsi+3?= =?iso-8859-1?Q?rf7N+b8jK2HZPRK90aLPk9CwltKVpHXYopG0yPsTolE7ggNL9uWT3RdAuW?= =?iso-8859-1?Q?uV7BrSssB11rTG2YyW1zjK4/svlO/+RVnrfCEDisMLykKhasruUbFDC7kf?= =?iso-8859-1?Q?vDwRLsXvFZ9uoRNuHkHwLaxuJsrGwmahyxbXt6+3trX8NHKP/DUPtQhlQv?= =?iso-8859-1?Q?fe+4YPPUrfQ+8pEAIq9mS1Qj+MP5qstzhyxJ/QZ0ejVkH4cw9ZIXFxXoiR?= =?iso-8859-1?Q?izgdQ13gwq2gyqbbUGUA6UDzmF891EcHEnFja01VaodR4XjHbkiYcTr4zC?= =?iso-8859-1?Q?E+ljyi1USUXmIf5FwJ2B5wJfChRBD8iPQgfsB8zFWWqGqgrGkctBaW3ya5?= =?iso-8859-1?Q?5kYmAjhUpvVjgry/G7ieya4FmJLl06paGL?= Content-Type: text/plain; charset="iso-8859-1" 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: c3e12844-4a0b-4b8e-0fbc-08dc4efc3c33 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Mar 2024 07:54:02.7862 (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: ZsrIMVCF8Ly70TqqOfMKmdSpOqmzdUzjkfxDh/tZPc/5ecMzJfH6NBZdFJiLHmQkHALI4lwiWrei4EazFEv3qtDpZS46KhwME0IOOw5ijPA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5548 X-TUID: Du/o9DOsYzxn This fixes the build failures detailed in the https://groups.google.com/g/i= sar-users/c/Va0Ue-ISYeA and=0A= https://groups.google.com/g/isar-users/c/PSGU_AcdPZ8=0A= This adds the MACHINE variable to WICVARS, hence the need to reflect this c= hange in=0A= cip-core/scripts/lib/wic/plugins/source/efibootguard-boot.py=0A= =0A= =0A= Signed-off-by: Nicusor Huhulea =0A= =0A= diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass=0A= index 73f1d52c..9b98719b 100644=0A= --- a/meta/classes/image.bbclass=0A= +++ b/meta/classes/image.bbclass=0A= @@ -377,16 +377,19 @@ do_copy_boot_files() {=0A= fi=0A= fi=0A= =0A= - for file in ${DTB_FILES}; do=0A= - dtb=3D"$(find '${IMAGE_ROOTFS}/usr/lib' -type f \=0A= - -iwholename '*linux-image-*/'${file} | head -1)"=0A= -=0A= - if [ -z "$dtb" -o ! -e "$dtb" ]; then=0A= - die "${file} not found"=0A= - fi=0A= + if [ -n "${DTB_FILES}" ]; then=0A= + mkdir -p "${DEPLOYDIR}/${IMAGE_FULLNAME}.dtbs"=0A= + for file in ${DTB_FILES}; do=0A= + dtb=3D"$(find '${IMAGE_ROOTFS}/usr/lib' -type f \=0A= + -iwholename '*linux-image-*/'${file} | head -1)"= =0A= +=0A= + if [ -z "$dtb" -o ! -e "$dtb" ]; then=0A= + die "${file} not found"=0A= + fi=0A= =0A= - cp -f "$dtb" "${DEPLOYDIR}/"=0A= - done=0A= + cp -f "$dtb" "${DEPLOYDIR}/${IMAGE_FULLNAME}.dtbs"=0A= + done=0A= + fi=0A= }=0A= addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_insta= ll=0A= =0A= diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_= wic.bbclass=0A= index bce881ed..f0f1c438 100644=0A= --- a/meta/classes/imagetypes_wic.bbclass=0A= +++ b/meta/classes/imagetypes_wic.bbclass=0A= @@ -107,7 +107,7 @@ WICVARS +=3D "\=0A= ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_S= YS TRANSLATED_TARGET_ARCH"=0A= =0A= # Isar specific vars used in our plugins=0A= -WICVARS +=3D "DISTRO DISTRO_ARCH"=0A= +WICVARS +=3D "DISTRO DISTRO_ARCH MACHINE"=0A= =0A= python do_rootfs_wicenv () {=0A= wicvars =3D d.getVar('WICVARS')=0A=