From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7351319485919264768 X-Forwarded-Encrypted: i=3; AJvYcCVU4DzLDTjytzA+ix57nFNsdTZyIBQTZ9v89LNB0jCKSb22HVa4AJZYfWcz69EtTm3Wkbyhr5ct7oybgwTOSPGFCDMitPB9tvCvk8s= X-Received: by 2002:a05:6870:7b4a:b0:233:4c45:18c3 with SMTP id ji10-20020a0568707b4a00b002334c4518c3mr2956513oab.26.1712931081587; Fri, 12 Apr 2024 07:11:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:3b12:b0:22e:c37c:47bd with SMTP id gh18-20020a0568703b1200b0022ec37c47bdls642744oab.2.-pod-prod-04-us; Fri, 12 Apr 2024 07:11:20 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCW+4TAt4zk+XZIjaG6oP3qC6D//+6mlxF+luY11Vdl6YFIXTpyR8q+l/bHypd8OdmipMhYu/+FyCEfUv+0TAGqD8cqq9zEuD/CuTf8= X-Google-Smtp-Source: AGHT+IHtHteGHJ6FeBc5dmaw/21jV7xs2OrXSwAerNXaeZc/KYwaJMBLScusdbTUcMCrR4+pKK6v X-Received: by 2002:a05:6808:4197:b0:3c3:d89c:196a with SMTP id dj23-20020a056808419700b003c3d89c196amr3133490oib.54.1712931080556; Fri, 12 Apr 2024 07:11:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712931080; cv=pass; d=google.com; s=arc-20160816; b=Kgr6C4crroQ+UmpgpsqUgToiRW4LwZ8UYUWua1F92VosjOhUE4fnsnLS24kKUQzLGt BPHvjQVIlBjRes2hUercpZMQNfNnef/U06bSzzlm2rZD8vu4mJfoXsJHLAdjQGI/Tuis lYoNuWlOm89ZJaD3/YZHFxKjzCfM6woGBVMpSDqo3E/W1OaMziha/41IRAZxSxukk3mB Z0CPxSP09kK3WQCHEaOEJw5onqe03voMAZxY3gODD0C22MiNywTNWMuZfdZMo47JiO6f 9usPGhlGCZh40nn/r1M6GNNtwVxF4ZaG8ufq7JSUQln177GMBAPAaFphOkppcPaz3Ga9 vWnA== 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=dcscGEwsmGF/kr310iBHwwPXu/A7i4nazDJdyvFecek=; fh=Q7LxutatS/TXRtMZZN66oHJ4tLBqDTE7B7BlJVUVwAk=; b=ukJ6V97KE3UhOMcoZ4qhe2ylQmrLul5xelvMQf/k7gtInrwZK5NbQXN05rk8brCowb FIPBl23ZMnRFLofOkHU9b0KnpxmWH0eS/KEpPhLOIbyTIRh2GrnVu5QplEpsCquOpJSC K1W2q54tVTDBuY3LfHz3nNK9CrZR6dpxnNi1eNOsd/eWcdKQdgTeFUYvy9JZ66WI1v33 qo2ZQ9j9pC0HEZeVDVEYSaJcoVAk41k7RUs5DQVvJ3SAvNDZNR6QLn9gBk5pGUCyf1jZ uKAPi7R3yDNxWtgbmtXOneFXbPW6SpywkRLcLRnL588Vc6uWC+67hAPQROpXIzP3lvOG C6Tg==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=w1IBuQdM; 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:fe02::61b 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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061b.outbound.protection.outlook.com. [2a01:111:f400:fe02::61b]) by gmr-mx.google.com with ESMTPS id m5-20020ab06d85000000b007e7f54888c3si222947uah.0.2024.04.12.07.11.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2024 07:11:19 -0700 (PDT) Received-SPF: pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f400:fe02::61b as permitted sender) client-ip=2a01:111:f400:fe02::61b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=w1IBuQdM; 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:fe02::61b 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=f8tfl+m4kUhiQDm+b/TM83w5tV2jE8Q/tahIhrI5YN0ZzDCnsqrBf3Hbs09QvjTbqsatNb10kD5M/3ENbiBFgHR5R9lVBhxcEUE3SKFpI3bHhw36U5/qfoDmXailJPM8xL9vSll74N3rfjeEee//DskKY27du/bDznIxr8ynOEQ2UyWtWzrrOVQIj84pLVDENcOejTOVpq8UBItbDEf+4Kr6UpYgYQ0k2o1aokTqEgGbhsofswUPdUD/Irwsk12GaMcbvEvcD+tDGJfhlFMyMDX3RbpD+HH/0If5GxHqbRfbHv2WezpcxB4F17LPb1ODHNo0wGVisUAj0IikKK9j1w== 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=dcscGEwsmGF/kr310iBHwwPXu/A7i4nazDJdyvFecek=; b=ePE2TuCbYpWQ8uWl7p9VbXYbG8c1IZSIh8BKxEWGLESurjBC+vZT/j9XJ0UzahDzUAsj+PE4rMu1e+iBMIC27h+Hgmk1jmM6MzsCgAB9W1G80dZXtEtkTrchV2d1IBlHQZrjObT4TETDh+ObOZ7ioMaPlhj11DqlvxYWjwmmZRjlI7Y1gscZYGL6Jd8hKTKGNPjnm/BpegB77ttUzkmR9zPLymfrae6x7v4OwIHycFiXaQ3myl5AljDBXDLXY8uV6ckrqzA0yxD9cWgjXsj0fEHDjLkKjij8E0GsMNlVNgzqTBNkB7Tc09awRyvEC8AB4oYCkmn9uEdgFHpqTkX0jA== 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=dcscGEwsmGF/kr310iBHwwPXu/A7i4nazDJdyvFecek=; b=w1IBuQdMqXclyh1XSPfL5diBPQA3rOtCDR2ryyIO33OaeFjmgp0mQ/a4Elr+b1ow2yH3Yh6qXTMgKVGGEgfs99dZTckbUC7OGRHnmGDvIeuKfasJP9EE3LNF+6tJ0LMa6fErUOlC1v1Pb9w3xr56vDaU+IXtKzIod63Jm+1qV6TMMcwnAxpb3fAecdxFsfnkGOmE7Sbe0DrDxIUsTFPdWcjRCQEgzGSgYOrt9jGQjiYkjdb2b4zDrVvMz4o+5Uhelg1PTs2MeVZyu21UiJs3cJDEu6YMN2zU9PD9hC8jwybGh224T+OG8B53CgHEd8NgxFIX/EqyVCySDydSsyK4zQ== Received: from DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:431::21) by DB9PR10MB5236.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:33b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 12 Apr 2024 14:11:17 +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.053; Fri, 12 Apr 2024 14:11:16 +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: AQHagNOW1dRx46VomUipLPKsb6RcOLFNcAyAgAAOLDSAEJk8gIAGrBfH Date: Fri, 12 Apr 2024 14:11:16 +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-04-12T14:11:17.395Z;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_|DB9PR10MB5236:EE_ x-ms-office365-filtering-correlation-id: 4aa9b6fc-1c5b-4b78-d357-08dc5afa6b61 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Z/5K30MDe49Mlro8X7wG3DqtoZAmc2rXuoYLvKT5wtn78eSsieL5GUL84t9hZXXjNNHNwsOhlTwXtsGfvpxfnBsS2FVW2dmPF+8pJq1W17lSj8yiEQ/LRMOGqLXZMzBfypbmqJ9l2yt6Mt/e8k1lWEGFD9U0ddX2qCi5BCMnAV6PIeipQEd1//IPiCAKtfSEMjUm1HKF/SlGxAVJUOnntpnl2Yjtemy0wiQg8pCj8KjAAnA7UIxUQ9KVAjepl07KdZulCogN4ArqNHrTE+IDw67yrGQJZCw8hqdLwlUmeN/68qxthoVw8IbNSzvKS8mpqODLpWqAEVNeU7xnZJv+OHV4czrAFcAlGbk/MdaLDYBsvhm7y0Ka3dYNDmwj+MIfWypKRjpyP1CZfOotE357t4Lz3Mxz82d1Qf9InksnPte5LNE+H7txluswNk82KeGHEEstSnRCAgpKuAgzHL81fpzVzpwwvk0MlbmxLOBjabba5QpboX6tTrZOrA0aKSy2Qr17j/nDzUyuRmCp2p0TrwDLfK448QFhsJEjCahC+isX9k/3NmvN6NxjQgjSb5jMeDXKbU5N+lyUsw9T2IbMG7ttKZOjI1ChZZYy2hXP1pJ07JNCpS9XYr8tZ56TYPxS4vywUW9PrNTqTgj2oT71kK2qz4d+PylsJkAldB7EHDBoVnaQWOH38l3HkX4EkuAL 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)(376005)(366007)(1800799015)(38070700009);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?sZ0sAP6foSGqNcptKlnV24GrCJcic9IY9ciCZ1mA9MZoifqy6NH5Lza6jYHG?= =?us-ascii?Q?LnluGf231KjyYjIBewMVZATE8jVBhc04cwJloPH/2HJwAtoK1bRFWyrZ57Io?= =?us-ascii?Q?4lH+S4NKkDRnR0khTbH1u8/M4Ri7o2NPokwPuJcTHxbf8iwffcSHyFPYq4Y6?= =?us-ascii?Q?fY7qq+iA/JwtbArce+a5X6E5YlFgiODoHg4gKmIrSSHln0Gq/bVyReylwX/m?= =?us-ascii?Q?kRpOCaGSIzepe7j3PLOuijS26/qHfhpt5V1j4Uli8bX5smxMTO6Gcm9m89/w?= =?us-ascii?Q?qIm6XXZl+hpYiwAgLjBiQZiZU1CV4vkqMKeM4kkezpyuF9h7d8kzPVLnrphx?= =?us-ascii?Q?XChHa2UVeMA7rPgJy6OLMtTVabIpUAhWNT1rg4y+xx6IwO+clsLg0U20hdqt?= =?us-ascii?Q?NvKpI/ifbCsClVrDpITrgqjcalRZWXfvcMk7oTFArj7TzGCIZI8qrEvTqLpx?= =?us-ascii?Q?cPo0DDrmJROPN2D1Wb06FEZSXPzn6QHFS2uHk7ofYV36pCRS5A9fKHYrpqkR?= =?us-ascii?Q?48DYtaBjipBgRe0ed6FbQ1MigR6t9pSTKxYib1X0sY7E/6YExu+Hd99M21sG?= =?us-ascii?Q?F8KxyES6073K5swpjI0K2Se3dmxyY9G65NYUJlRAvLbjpnZeYgoCa8/iw9qf?= =?us-ascii?Q?vV3r18njgAo+gFU/YF9fhhbh+yA7uutIRPx7Gs6f08DuyGMDN9M85lnpZH8H?= =?us-ascii?Q?xgfJR/SmA91fE4Q9PTJjbDj700Whu4EfzXwHozlmW16UhvehvXxma2a9Nt0i?= =?us-ascii?Q?C7SNCIfgXG/EScebLcjQstG8DxjQ5oXgrl3RWyMshANS2xTyJtaejfYDcN+3?= =?us-ascii?Q?m4OY21I2voU96BUk2rRh4t6zYq1SS8IU0hS44ATUyHHBG6zrHe3LlDWO/UwD?= =?us-ascii?Q?YOfncChz0mzJhFJeEjCWmWwqa+LIX2y2Qmu9LoPBh28KGNOA2ytptwYyecRL?= =?us-ascii?Q?5C7Bx6Flf/zkPz+MQnXlsi6AEDZQtkFpqQHZhjCtoTrCYvz+mRvZjEIl41EL?= =?us-ascii?Q?jBx9S5HYof/y+CEYriL4ao9494Oi+lnctnkAxCshTPrxHWMNO0vKukmEUnNO?= =?us-ascii?Q?t/ZzTnL4L5QwNc5pVPc7uZAo7ItFRkjgE4gJXyUODzcr4Ghc5hasQTRsMMgD?= =?us-ascii?Q?1v5iNt6VyRlcWTKpW6ckVbvezBs2kDORnpiKw/ABtQ3GMD3JQBb6rHPAfzqz?= =?us-ascii?Q?ANlHjgEV9uRQBTzeNZxdI/lOLVdk/7/SsS88rH6iTIfd6ZLYN8UL8bU2Q9f+?= =?us-ascii?Q?MgcucjbZN5DrOAssd7BwZ481DNetaRxUDJpcJktoWj6OhMRStRelr/9Fw8kQ?= =?us-ascii?Q?8ABXjNVUN6zemiYRwqyC17BLxMahM9du03AtnoVvKQ1D9jdkk28L3seAoST8?= =?us-ascii?Q?FQJy+ddmzx/28WhnqFaTFpl7LEz8CynKWQBhZtoNouNzcdSacXrgFF/7IKdP?= =?us-ascii?Q?kKpjOZZPj6YNshUiy0EjTxa2Ifj8FRR/y/q5JApnAxj7Hc7n5v9+OuSl7zkS?= =?us-ascii?Q?P5z54sTizn6TeEgXLLXCC0FdCrfOVH6KVdlzbsPVZ3RyFZdTz5jD59SxNTst?= =?us-ascii?Q?uTfccynmcK84JaY2zICVvZaABvQFI7p0KpTjA/fm?= 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: 4aa9b6fc-1c5b-4b78-d357-08dc5afa6b61 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Apr 2024 14:11:16.9339 (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: j3UzZtg0RKVe+1LGmzdxg7UGg+h+xkzB6Gpvj0BbljhlJHJsd7cXu0r39mcqbkCIDJ3urdAsDKmXy0mHVITcRvCrdnkQcYFQHJIrsm7cSVo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB5236 X-TUID: k08IrMCtlIxB updated all the cases where the dtbs path needed to be changed * update the other areas in order to sync with the dtbs directory path Signed-off-by: Nicusor Huhulea diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 98741da0..e90f8fde 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -364,16 +364,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" + done + fi } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_insta= ll diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_= wic.bbclass index bce881ed..adbde400 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 TARGET_S= YS TRANSLATED_TARGET_ARCH" # Isar specific vars used in our plugins -WICVARS +=3D "DISTRO DISTRO_ARCH" +WICVARS +=3D "DISTRO DISTRO_ARCH IMAGE_FULLNAME" python do_rootfs_wicenv () { wicvars =3D d.getVar('WICVARS') diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta= /scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 4bfb70a0..218a7fe7 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -57,7 +57,9 @@ class BootimgEFIPlugin(SourcePlugin): if dtb: if ';' in dtb: raise WicError("Only one DTB supported, exiting") - cp_cmd =3D "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) + image_fullname =3D get_bitbake_var("IMAGE_FULLNAME") + dtbs_dir =3D os.path.join(bootimg_dir + "/" + image_fullname += ".dtbs") + cp_cmd =3D "cp %s/%s %s" % (dtbs_dir, dtb, hdddir) exec_cmd(cp_cmd, True) @classmethod @@ -353,8 +355,10 @@ class BootimgEFIPlugin(SourcePlugin): if dtb: if ';' in dtb: raise WicError("Only one DTB supported, exiting") + image_fullname =3D get_bitbake_var("IMAGE_FULLNAME") + dtbs_dir =3D os.path.join(deploy_dir + "/" + image_ful= lname + ".dtbs") dtb_params =3D '--add-section .dtb=3D%s/%s --change-se= ction-vma .dtb=3D0x40000' % \ - (deploy_dir, dtb) + (dtbs_dir, dtb) else: dtb_params =3D '' diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wi= c/plugins/source/bootimg-efi.py index 634a808d..07b177df 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -51,7 +51,9 @@ class BootimgEFIPlugin(SourcePlugin): if dtb: if ';' in dtb: raise WicError("Only one DTB supported, exiting") - cp_cmd =3D "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) + image_fullname =3D get_bitbake_var("IMAGE_FULLNAME") + dtbs_dir =3D os.path.join(bootimg_dir + "/" + image_fullname += ".dtbs") + cp_cmd =3D "cp %s/%s %s" % (dtbs_dir, dtb, hdddir) exec_cmd(cp_cmd, True) @classmethod @@ -334,8 +336,10 @@ class BootimgEFIPlugin(SourcePlugin): if dtb: if ';' in dtb: raise WicError("Only one DTB supported, exiting") + image_fullname =3D get_bitbake_var("IMAGE_FULLNAME") + dtbs_dir =3D os.path.join(deploy_dir + "/" + image_ful= lname + ".dtbs") dtb_params =3D '--add-section .dtb=3D%s/%s --change-se= ction-vma .dtb=3D0x40000' % \ - (deploy_dir, dtb) + (dtbs_dir, dtb) else: dtb_params =3D '' diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/= lib/wic/plugins/source/bootimg-partition.py index 5dbe2558..1ae6216f 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -180,10 +180,18 @@ class BootimgPartitionPlugin(SourcePlugin): logger.debug('Kernel dir: %s', bootimg_dir) + image_fullname =3D get_bitbake_var("IMAGE_FULLNAME") + dtbs_dir =3D os.path.join(kernel_dir + "/" + image_fullname + ".dt= bs/") for task in cls.install_task: src_path, dst_path =3D task - logger.debug('Install %s as %s', src_path, dst_path) + + dtb_file =3D os.path.join(dtbs_dir + os.path.basename(src_path= )) + + if os.path.exists(dtb_file): + src_path =3D os.path.join(dtbs_dir + src_path) + + logger.debug('Install %s as %s', (src_path, dst_path)) install_cmd =3D "install -m 0644 -D %s %s" \ % (os.path.join(kernel_dir, src_path), os.path.join(hdddir, dst_path)) ________________________________________ From: Gylstorff, Quirin (T CED OES-DE) Sent: Monday, April 8, 2024 11:12 AM 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:05 PM, Huhulea, Nicusor Liviu (DI CTO FDS CES LX SVCS) wrote: > Yes, it will break it without patching it. I'm not sure where this bootim= g-efi.py is being used here, as for testing usually I'm using https://githu= b.com/siemens/meta-iot2050 It is used indirect with bootimg-efi-isar. Quirin > > I guess that in this case the equivalent for bootimg-efi.py is https://gi= tlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/scripts/lib/wic/p= lugins/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@googlegro= ups.com > Subject: Re: [PATCH] image.bbclass: copy dtbs into a deploydir/subdirecto= ry 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 thi= s 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= /wic/plugins/source/bootimg-efi.py > > Quirin > >> + done >> + fi >> } >> addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_= install >> >> diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetyp= es_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 TAR= GET_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') >>