From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7358404835704569856 X-Forwarded-Encrypted: i=3; AJvYcCXXLXnkJaBVRA2B7cerqCr1XRYcOwXoNdIiOQ8zkopKeuHtjOCVgSDrvXvWHFViu2JhqH9+JotjJT+FwUzYNXyfuQEpzKrhMgnDI24= X-Received: by 2002:a05:6870:24a9:b0:21e:8590:6a5 with SMTP id s41-20020a05687024a900b0021e859006a5mr18088759oaq.2.1713346228838; Wed, 17 Apr 2024 02:30:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6871:2887:b0:233:e9e6:5912 with SMTP id bq7-20020a056871288700b00233e9e65912ls2882065oac.0.-pod-prod-04-us; Wed, 17 Apr 2024 02:30:28 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUhLj2ou/6S37TYeFvFaL0eRJ0bxdqR2CTE/zuSpDsNe30rOkd1mNClw4y5YIH8ngAvRFtstGz6WyG/JaYjvekA7QObVzoHjovpNnQ= X-Google-Smtp-Source: AGHT+IH/LdIlFjGSs0HDh2TupP2t/7pUdOJ8KmQ/HvFE9gMUC7XYT9IVkYv8kDZRL0b1oAoAJCU4 X-Received: by 2002:a05:687c:40c:b0:22d:fcf9:f771 with SMTP id cj12-20020a05687c040c00b0022dfcf9f771mr10943444oac.25.1713346227868; Wed, 17 Apr 2024 02:30:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713346227; cv=pass; d=google.com; s=arc-20160816; b=Ay0CEODvtGpalWbS9R1t6YWjckfK9fPi1VTCpeJnw+GBdgT66f/xbWwHf0nCQuDP9N lrileWIgNq01OBxbIQvCkNKr8OvwutNKCx7NyDS1wNXU+LRkuvgites13fJzJiqZRwJU dW53a41wIdUb4IEpaEvIwAMPwCdfn7OVTUPDcqhsDgcVOHJ8KKmfqNMVQ+q7tjXJYfm0 HsT86Ja/NYkgwzMbgGxn43T4iA4TLyz8H2LLw9hN4dCub0ErwFg01HtX05t+CHjfSfh7 EJN3ZfKOrBqzEuzVmfAglnjTg7Zeu/nSOC7/gX0DtErskd19pLouskXUKZlaZ5UYEsH0 fGIg== 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=lwbzpgetGsMQZTNygLTDI0pCURxkEXlX+7QnOfMSwKU=; fh=G4IkI4r6DCgL7WeyEESnryWkaZGiKugyDTTIA5ARUck=; b=enGTQBcG/0gLNsIcHjCCR33tBOHY2791PO0wU2+KR+giacHmCMkAUI2S29CtxQG5eh nMoRfjuUFr4/2wy8p4Rw+mfUYg3HZxryV3XC33Z1q3jaeQCVAlLDJe+VXUiLd/LV+TUG DqQwBeWtWaynz0ZmxeZksoRjs+OWp5vs/1RLFbn++YkQwN1lLtOPCQhZ6XA/hmc+fp2W SA28+X2fSsNR0I4XqKjCLDLji3TMdy3Z/jZO5mkOJ0gf6PZVbyDUm22Uhri3sQZMw0rN XBlULReF5kkf3I2yWHXqtPCLRISTup9+U3+HnN8/d3xGtY/Rmb0lWY0oiS2NovYbw1pF 27jA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=eDLlv99m; 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:fe0c::617 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 EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0617.outbound.protection.outlook.com. [2a01:111:f400:fe0c::617]) by gmr-mx.google.com with ESMTPS id f44-20020a056a000b2c00b006ecff7658afsi742485pfu.6.2024.04.17.02.30.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2024 02:30:27 -0700 (PDT) Received-SPF: pass (google.com: domain of nicusor.huhulea@siemens.com designates 2a01:111:f400:fe0c::617 as permitted sender) client-ip=2a01:111:f400:fe0c::617; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=eDLlv99m; 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:fe0c::617 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=mgeBUgD0Eh8ubifKig+N0IMuP5gSQ18OURAquHGj4elo5P7H6EHKn/sFKdDifYQIQ154PjdNltbbKvoOaxcN4Q63Qgjrh4iG2G5GV5RoQXd2j1f6G7xGksNZ7q5XGbE/kD6jybiczeynnPO1eIMAy2sbrQUlfYXhaFnOWeN9hfFOn37m55TIey9rg4I+eLluu1zgu0xxGYLbNY3PW9npUC5oGZURoU01R6eZrV32LOjOS6IV7hx7+CqtXFH48mattOTJLeY/3Y1i9rXOvcc/XsAwh/elyPYfAQdmR++uA76A2e323s6iYZHo3AynMUqSXInbJdKVaXZwKuVxGsH0aA== 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=lwbzpgetGsMQZTNygLTDI0pCURxkEXlX+7QnOfMSwKU=; b=ktpvWsHb6wcqWAG2THYN7ugWvSEdmWfTY7F6hdTW6pMsoHt1Nk2sGnznH/7tZ0sSSoFh3YvS9/C98lTDoKFfeNa5Momoq+n4/uUcDrjagzxZXO2+5iRYhKkuTVBl1pt2UBB6P+1G+kl0BjOr2qUfXv8VfRELxLYomGrn8o5ZPOncbQ4OMoEEDvPuKxx5wBglecAaZsFIVYyd1Drws87DDnekL5gFBZiVUIoe6zIm8CrS/KNaO0wO+B4SJ67GI8d2wdHspSM9xI/uNf+X5vejIbVumu6RGicbotuD09V0rR5G2eKAAOGmZHtNJFTEHtgcNLVPnWN0gjmw8n1NTk6Olw== 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=lwbzpgetGsMQZTNygLTDI0pCURxkEXlX+7QnOfMSwKU=; b=eDLlv99mWiAbbNxTEq8jPwHOCi2oCH5PlpfzKS05kyBuPjqRE9RWhC1NrDMDHv41/y4/cXD6D9x9VUhyEzozVMa1BJYKkUE2bk1w8marfeitBCgEBZ2mMn3E+0VXqJVBCByjRfMZvgzaYqOmxI5rkfsRRje/UcYZ3cQ2/J2JWOVXdabjK5o3MTtIDvz6XeQzcUGxpr/0QmvJWAKjAZS8PT9IcUkOQnhVv59knAlCVZOVJlxijDDOoJXMOLXGMi+XjuN0hWvlICBMfpSFksclFU45K+KHb+Nq6exHVnYO2hgsOekiB4x/o00rvJUkboqmAHKwQ+9kFYG02Eqfur6IvA== Received: from DB3PR10MB6908.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:431::21) by AM7PR10MB3908.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:14e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Wed, 17 Apr 2024 09:30:24 +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.7472.037; Wed, 17 Apr 2024 09:30:24 +0000 From: "nicusor.huhulea@siemens.com" To: Uladzimir Bely , "quirin.gylstorff@siemens.com" , Nicusor Liviu Huhulea , "isar-users@googlegroups.com" Subject: Re: [PATCH v2 1/1] copy dtbs into a subdirectory based on image name Thread-Topic: [PATCH v2 1/1] copy dtbs into a subdirectory based on image name Thread-Index: AQHaj+X+uvvx4v6tWUmEpeUf3d8xVLFrCAOAgAESe4CAABLTWg== Date: Wed, 17 Apr 2024 09:30:24 +0000 Message-ID: References: <20240416100746.5681-1-nicusor_huhulea@mentor.com> <3ca17e6f-d449-4a8c-b97e-026f31ae6e5b@siemens.com> <83c763aaf967f29b0e47ae05267df0402a5247e1.camel@ilbers.de> In-Reply-To: <83c763aaf967f29b0e47ae05267df0402a5247e1.camel@ilbers.de> 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-17T09:30:25.246Z;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_|AM7PR10MB3908:EE_ x-ms-office365-filtering-correlation-id: e81960ee-9d85-4afc-f607-08dc5ec10293 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3ppGRlOis7/gdWJDCNO1rri8uqF8u2uxH4dWfM7vKmLX/P5HMNylZE9IyMHggIH6OHVud9TQT3IKExcxV1lJzf2MP7h+efdcNQ4p+jom5XnACdZYrl1cD0d0ldFlo9u8PTapC2KD96k0urFVaNs2oNrsOvIgXyifQ/cH2a2ck/Bet/KWRdhqzrE4ekXgI7sh/iuAry1U59eKPzM/7G3Qi2YaHk11rlapuPbUKFKEbwUCScv76Vlh4PKB9t+g4P0VcmhaPupycb1x32O20myZ3RLD3ua5QNugAcvNit+dc2/TS7nCTDDMkzLsAOioo+kPhx7sSsjQqik0XOfjy1hHlSlTCD3E3OZTPaZanXsWyNjJy5XF6Q8IMgm0F4MYyy/9ps1Rlec8E/KoeKo7MEcEo0X/g6FhVth3hgEoetjAn0hRx0dZpneF3UnPxDHf9NNb2XB2tivX6x+N+K6z2hP6jqSP2ZJXiXuU2yMh0L68kdmCUakRjzQrgwWq+ni9jXbLOD5RN0YSzLzbQ4Vv1GpYR5PMohj1rHurAQO2W39o6Gzjkm+WWd9fivJXmJX3kUxUsUJ0IMJBmenLqNIWgLsxm8yF9Po/CI6gp4lPC/L1pu1VJ6qTDwdkl27YRiU9IAxtDtBiYxcQyPA9ozzg0fXkRIfVtWC49o5K9nCTeAyoNnrgdvqMBW0ISXazTd4xglaWgw8RtfcfcoGVTfi7tcDEo4uRToytfh0kOyDhQDbWd5M= 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: =?iso-8859-1?Q?8LaN/T3OeqdYVZmGJBthQ5IIbuGC60rAUoelNM2LZcbrldI50QuKKOPHxy?= =?iso-8859-1?Q?xRNwzw3ZySl0MTWItTISaYi1POTEP2aoXtkh7ZBGoJCv4fIpHv4M0euagr?= =?iso-8859-1?Q?7FMUIB2f3QW1YWjSzGmj3SR7cgsPk+fdw+rj66oLrIPlkUclGsxyQfmjdG?= =?iso-8859-1?Q?zDplMWt7+tZdlqTu7928McUINK4XOz57LOzJ0qNKxekvADRyNXRgWgJcIt?= =?iso-8859-1?Q?GN1+vEO+iLletgoW1AsauVm4qNbrLS2e+LHc6itqXF8g7DwEuuY2XzGj5x?= =?iso-8859-1?Q?A8+TrQyFIuYPoUwi0jeadMVd0H+gcTQQAzqsMUWJ1a9pxS6dtFOqjRPEvT?= =?iso-8859-1?Q?BMTnlnXfwXZ3bXzw6xaY/meFffN7i49EXQHF7fdVyl66pKr8erkedsxn5n?= =?iso-8859-1?Q?HwyPEXIcqdJSLb/4rxG/+2ldyrQbTtYSdcd+Nt5l3ggK2dUN+NDdlRa9vz?= =?iso-8859-1?Q?AaV1vw5ep5XbjEO/aYOLtlyLNFHemzjDBkywi9mOEqqALoRl7lBUn1YmIS?= =?iso-8859-1?Q?dXe4sfIu6oglBNLV+RL8azkXIA+sRznfXj/dDUjHX0JDKjhaVKm3VLtSOp?= =?iso-8859-1?Q?fk5Rql9GNYEzAcO87tgaiT356aH5+u/5zRPs/YI7NzkGQELY+hPL5u/azp?= =?iso-8859-1?Q?kg4mBV52kF+HrDp7YApEkQM6zkAmEGaeXtZ+wHt4Domin0rrxUm1n3pbi0?= =?iso-8859-1?Q?C+4MZHkCueUbHjtXIAGMdzZ5OBhVBq2TrMdpkUZo+9pwnxQZOPRm+8xl71?= =?iso-8859-1?Q?4WTTZhxLbL3Wuq22T6yQSm68Pda6H8ylYiQ3iyYfCVsh4irB0gd2KfRHRl?= =?iso-8859-1?Q?G+0nFQIWswamw7MCuzd0UR9yHLUVMVBtnT0fkwbmRU5mzciT4gPUGvrkJ9?= =?iso-8859-1?Q?uTyuTws1d4YqjNRNTrE9nEc5UFDokEB6QvFbUecWxkOIjnDVjTh2/7QR3s?= =?iso-8859-1?Q?J4bRzTui2FJUB1MJA7X3rUA5mmBTMt2zpu/TUTpWfPHSrFIGA153u7UJSE?= =?iso-8859-1?Q?mDVdJwVxy3MSy5PgctWdZNh1DJwX5jlOfARV38nFqzzhvAUk5GOqidw1tQ?= =?iso-8859-1?Q?bofU2/sVCt6g28EDPgr9Wjc+3f4ThgH5mK0/i8tEiBNzISmOESpMm2qFYD?= =?iso-8859-1?Q?KudeVoe0GrHrWw33F1UhU93gboo2c44SFC1zay1QNJWZmN2VAszBqe/cea?= =?iso-8859-1?Q?Buj42Id9HuZtxj7FHGYTwCqOdCXRLeY+fz205iRCgLRITquz8zckUYOO+d?= =?iso-8859-1?Q?V/VGNocCedG0Txkw3oTWYhUTN8IsSHMIAAXBLnCGLUNMo0O8Tnn3njfkAO?= =?iso-8859-1?Q?rX9rh2lZqLEomUQsCVrCYzVk+8D5VYrRijZ54BJ1w0nNyFNfetXJ9m64dL?= =?iso-8859-1?Q?U0yk9Gw/pAgVqm1Nnk5Nxl4RXwkq+am9ds6j07AzQy8xUshfnwx677z/7m?= =?iso-8859-1?Q?4dHcC6MTTOtdWzVgcHA/udEOpyl71Xw/8CbGhRyHf0bep7eaM7ZPwoOgk/?= =?iso-8859-1?Q?rrPeKlIDSOEV5xbC4646VCAFz2SzdxgcTtShSzZuzbqGXcEKEtA9fVaBJS?= =?iso-8859-1?Q?B1tavvaBlpx/leJRuR8I6OxoL3F6znFvv2NeY6DtVa4mEKLiMr8Dr8C0DM?= =?iso-8859-1?Q?EDk2Je95QJKvt77VG3zHZ+YBo3zto7pqGW?= 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: e81960ee-9d85-4afc-f607-08dc5ec10293 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Apr 2024 09:30:24.4368 (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: M7mUhsvMwd92ysAvKfdvD+Wmmr/510zItlC7AhAXz49DgWLH/wzB2b95MdzLa8BC2j0F8jXUBP968V5FccVtGReQ98fIF6DNV9B/NBpp4Bw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3908 X-TUID: WOZQ495CX8WS The idea of the kernel's recipe being responsible for the deployment of the= dtbs was explored but it just did not seem something straight forward. Since this problem appeared, several possible solutions have been exposed b= y different users in different threads, and I just chose one that I believe= is the best and has the least interference: 1. changing the bitbake variable DEPLOY_DIR_IMAGE 2. no copy of the dtbs of they are the same 3. change the dtb filename based on the image name 4. move the dtbs into a subdirectory based on image name 5. kernel's recipe should handle this ...(there can be more) So, each has advantages and disadvantages. What I have implemented just kee= ps in line with what is currently present. The disadvantages are those dtbs= path changes. A case that Jan mentioned about a dirty deploy dir with a di= fferent config for the same machine/distro and a need for the down layers t= o modify the dtb paths as Quirin mentioned. Having the same dtbs in different folder I don't consider it a disadvantage= as there can be cases where the same dtb name implement different function= ality. Kernel's recipe solution seems much feasible but I don't know the implicati= ons on it. We can consider this as a transitory solution until a better one= is found Nicu ________________________________________ From: Uladzimir Bely Sent: Wednesday, April 17, 2024 10:59 AM To: Gylstorff, Quirin (T CED OES-DE); Nicusor Liviu Huhulea; isar-users@goo= glegroups.com Cc: Huhulea, Nicusor Liviu (DI CTO FDS CES LX SVCS) Subject: Re: [PATCH v2 1/1] copy dtbs into a subdirectory based on image na= me On Tue, 2024-04-16 at 17:36 +0200, 'Gylstorff Quirin' via isar-users wrote: > > > On 4/16/24 12:07 PM, Nicusor Liviu Huhulea wrote: > > From: Nicusor Huhulea > > > > There are cases when multiple images are build and because the same > > dtbs > > are copied in deploydir we have a build failure. The build error is > > related > > to files that are installed into a shared area where those files > > already exists. > > > > To solve this situation we will copy each dtb in a subdirectory > > based on > > image name thus avoiding the conflicts. Therefore the other areas > > needs to be > > updated on the dtbs paths. > > > > This is a special use case, which breaks all downstream layers which > currently use devicetrees. Coping to the directory dtbs should be > disabled by default as for most uses it is unnecessary. > As an idea - could it be possible to move dtb file deployment to the kernel recipe? We have the conflict in deployment when, e.g., "debug" and "base" images are built at the same time. But both them use same DTB files that kernel recipe built and put into /usr/lib/linux-image-${krel}. Why not make the kernel recipe responcible for deployment of DTB files then? On the other hand, this case won't work if we use prebuilt kernel/dtb packages. > Quirin > > > > Signed-off-by: Nicusor Huhulea > > --- > > meta/classes/image.bbclass | 21 +++++++++++--- > > ----- > > meta/classes/imagetypes_wic.bbclass |=A0 2 +- > > .../wic/plugins/source/bootimg-efi-isar.py |=A0 8 +++++-- > > scripts/lib/wic/plugins/source/bootimg-efi.py |=A0 8 +++++-- > > .../wic/plugins/source/bootimg-partition.py | 10 ++++++++- > > 5 files changed, 34 insertions(+), 15 deletions(-) > > > > 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_install > > > > 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_SYS 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_fullname + ".dtbs") > > dtb_params =3D '--add-section .dtb=3D%s/%s -- > > change-section-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/wic/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_fullname + ".dtbs") > > dtb_params =3D '--add-section .dtb=3D%s/%s -- > > change-section-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 > > + ".dtbs/") > > > > 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)) >