From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 04 Apr 2025 16:31:32 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f186.google.com (mail-il1-f186.google.com [209.85.166.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 534EVUm7013665 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 4 Apr 2025 16:31:31 +0200 Received: by mail-il1-f186.google.com with SMTP id e9e14a558f8ab-3d458e61faasf23617005ab.0 for ; Fri, 04 Apr 2025 07:31:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1743777085; cv=pass; d=google.com; s=arc-20240605; b=ZNUj4BNWHsf5BgZRGcQPRM9329gykNaQh7MF1trUbe+EOdW4ij9qZcnvZBpzfzib3o 3F70/ZeHaxWqaXjh/4n5FeplEfMWxi2NPLl5Wzm5kZSVXv0X3Yd3GSTd6cSfVJ6kh7gv ojK0PVkpWnLfd/iL+VOukRDGEXOVq1FrkcPcePpOEyWxtZ1Q//fGLzE1smxfhYPdpjY1 F7E7u4hhxOhFJrVjZPzoS7zjm8UnntDNqEL0KmmYb8QiUWBQvzBnekz8P4+857yaH8cj 2dwq08PCdsTA1bUy7NjxMdfmZjKG4nZeqKKonArw6TzZKNKAD6POkxr7+BEugq1SBBNR aKzQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:user-agent :content-transfer-encoding:autocrypt:references:in-reply-to:date:to :from:subject:message-id:sender:dkim-signature; bh=ZuwGj+S88GiG7gv89wy4Ns8JWxlL5zvMEFZ47ChuYuk=; fh=vwpiNruVG0vuct+svOt+5fRhe6u3vhOMYS43DVtRoVg=; b=ecKVgF15UMoEtUptREc/nup55vGrMB/DhfwfwJW4vWgUKshmJuHvvVUQfplOUsaGoR XwxOXV4UeIci9Nznwkdm+/zRzshNrhRi62Alni5ssWWsZP+td0+JVgSsqgkbjS3fJhxv vB8Dt+NSms9gy74qF5zc5gg+vGAGY8MnAlFlYjjDiwSlPnhuyQiRPDn8CTlnLOVpEeem 0SjGtovyyukRD4KUzHPImZkJ05Axi9E3qPkcFiIGBtK4nZnRwhOTXa8CoCGvywHd0KgU BkGEtayyhaY/AWL+Ztyzl0snrrwxmKTVvxQDQCw5Xpl2HHviq25IPi3Txi6MrexWUi+L YEiw==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1743777085; x=1744381885; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:user-agent:content-transfer-encoding :autocrypt:references:in-reply-to:date:to:from:subject:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=ZuwGj+S88GiG7gv89wy4Ns8JWxlL5zvMEFZ47ChuYuk=; b=uKF7xuF+ij56+QqTEuRHdUQo+HZF8+uopVq0K3LQHz0rSPcNAL2VRivd59zV5h+7mb DD6O98yoLvLpEsS0s5q3ioE9tynaEAxDv/Tj86y05bU0/S2Mge5x6NcUgHZ5p0hQ/Kjy FOtVzOAWJVDTjP6+mcstdhFMTbVYF5pUQeWvpWKnHFHbxPW+QbAC33aiFWe7+OhTIuuA vTNxZWjLYK9sfg+TYStITBtlnaUCoEmZ1jPp13CDChXMMyguVwgzknWuEpOL/8XEkIME Ljhi523WzHeBBkOFIZjpXbdtOQ33RJjEAojGGllY1blBKBgqZCyzUTmBQRaMmIa0sbNW q2uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743777085; x=1744381885; 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:mime-version :user-agent:content-transfer-encoding:autocrypt:references :in-reply-to:date:to:from:subject:message-id:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=ZuwGj+S88GiG7gv89wy4Ns8JWxlL5zvMEFZ47ChuYuk=; b=K9aNXUNV4XR5FO5FDsFUqI2V1df28T9nZplk7g20SfPKgrYZS5EEus1sk+gHwPSk54 xotdZWY49ucCQHdQnwGPDRYimIZ8ptMml6O18PY02SnrARsYx5mjgKPCxhv8YI7+/xQl mdSPaVKS40oLvO8fUGnf3T+PVjbeX9MDHJXVUSH4u5zQ/E+hRPTwMd//WQ3c3SOzhio1 akOqAwWyrtdRSWa3Ht73ThriueLmQKXQawkASxRprMMV1HHeE5s8MUdYLNatN+i3C8i4 C3V+K7h+PrllaNxz3Gg5p4wykAl8XO6MUHHiUlbiHYfhP0o24VRh7M6Q1MdACGGaBP0S FUTQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUx1GPFjnrA708ikQfgkeyKoW19H3hyCIcFmDrjnU6T80uUFrErv9mOKzsfpRE3AkcNCOVj@ilbers.de X-Gm-Message-State: AOJu0Yy8DYKPok4dwpafwseIlYEtzQ3qXUxzsCKmoSabTAR21Yt285PA 2f3xSNzD5VOt6xQ+w0/bg1SLkaXVJijm+uoK6/4nXS1XnF6Gmayo X-Google-Smtp-Source: AGHT+IG1KviNYv0g6KyvXyj9Thn3N797shCo29s1YSA2bdz170TREVfj8YW0LAl1nzEA6pqIkiiicw== X-Received: by 2002:a92:cda7:0:b0:3d3:f15e:8e23 with SMTP id e9e14a558f8ab-3d6e40209e6mr34019175ab.10.1743777084750; Fri, 04 Apr 2025 07:31:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAIaspZ5oFp4whHrr095iCNbpzy0UkIzmjBg1ihgHgG0tw== Received: by 2002:a05:6e02:3702:b0:3d4:58a3:f73 with SMTP id e9e14a558f8ab-3d6dc8b05efls17288085ab.0.-pod-prod-00-us; Fri, 04 Apr 2025 07:31:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVOAfPXYAjcj0p1Tki8lmDx2aTEdmcWJQIrlgQfrT+GzQrr3xuzELwVMKUIl0tO8DC5IYEw/8WDi+jQ@googlegroups.com X-Received: by 2002:a92:c242:0:b0:3d3:fa69:6755 with SMTP id e9e14a558f8ab-3d6e3fa2e3dmr35419955ab.5.1743777083691; Fri, 04 Apr 2025 07:31:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743777083; cv=none; d=google.com; s=arc-20240605; b=jTr/Va+yT1XqId7Cd//R4NHmIP9lEKuMWQen21Kp+pGSkOxNREOQJ0DEYfuTgcwCkX WBuC8GNx6Hu+qkaeMYV3TDa20F9DU0zI32S7V2LVRhZXTFeIlsHUOg7XcqjSUQHM/B5b oTMKXxQjNdNI/7QlgDgQIDDAAnWpPbVFv6qmRMANOQoDhhcjTUmHcO4RkQcfgN0C18G4 ULLPOUyIujlG1lbyYO0rIFGc+/3+qaj4pXMVQRPihdgq7oR4HfhMip89mZO1U69k0cNq J/x80sh55kL5hkmpJGYmwBvE9anpdzCHU+t7mDAUZF+DKJN7ZfSmjRDf5eMGuuiURBvW 2WCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:to:from:subject:message-id; bh=gIa7iTNMDR/Oqh1GPkDwtIW4ulszjqgrKK83ewsWHhw=; fh=fmpZHNomcmQYoJg6Vx8bvOilSvfJjYMl87QECbVA5zE=; b=kpfDLbVXz/u0Kq++Bb6T4AnbN8weZo87iHYORy9rT/NdIXbxf/ovkq+nxFPU2fP4tk Ul5K0m9I6jZ5k/V39e/VTq47ddtQEDHeRtAJNcU/Z2mJ/l1eVcOiDrhy/OeW17agWzLQ LqL4dXn84kwAM0t2+m/vczZaIpiOBo7Fjr+yjP2xoawXZQau1FBAbAgAJn55sZdDZBEb 2bwAK5hPp9zFY6gjqFAV3KBfRveILmF6sxe2EHeWPO0dgse4vU9vqxmr4veA39tVx3QE JhjiiYwYaE5iljY8QgzMuKSY3oqvDIdoo0slW78TI/KfOGbiNVDX5dGiD6L3M+vZsyDn 633A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e9e14a558f8ab-3d6de7e1654si2103445ab.2.2025.04.04.07.31.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Apr 2025 07:31:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from [IPv6:::1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 534EVJkZ013600 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 4 Apr 2025 16:31:20 +0200 Message-ID: <3d694944eb24183d241bf652c43a60d7b73aec69.camel@ilbers.de> Subject: Re: [PATCH] image: copy DTB_FILES to DEPLOYDIR/IMAGE_FULLNAME/KERNEL_NAME/ From: Uladzimir Bely To: Jan Kiszka , Badrikesh Prusty , isar-users@googlegroups.com Date: Fri, 04 Apr 2025 17:31:19 +0300 In-Reply-To: References: <20250403170701.807745-1-badrikesh.prusty@siemens.com> Autocrypt: addr=ubely@ilbers.de; prefer-encrypt=mutual; keydata=mQENBGO2eUkBCACtT+T3OrPVSExBmqfgXT3lp9XcdxRzjYp26wezkgYjjBXaf36bxtaAf S471VoQtpar0RVeFfW7WDDdfX9ZclSj36zBQe+RVSJzoNoNQfjOXWuSHb5Z+cpAFtqBY4muxK4+ia IlLJd6CN3ejOsLHATtCeHHq8wi0z2T+KdLQO+wQRgo2hjj0Lp9pGTrKJry50HP/o7Vbdu14dOx2xq r8+wPc6SQbBIrcqaa4MqCQC00vQG7eXvo+k2MOw59FDdpMH0KR9mHgp3u/s4I+4YRBArukt9G9xz/ rsEFmxAIBC6N/a6Hzwg4puc91n7ABDsPg8Vp+X3MDraujN0dvR6OKVNtABEBAAG0IFVsYWR6aW1pc iBCZWx5IDx1YmVseUBpbGJlcnMuZGU+iQFOBBMBCAA4FiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAm O2eUkCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQAUQYBM/2FkprlAgAmuna8Hm9EyoEtTl DBGDg6Zm4ZLp5ffvZBE946h92jepDrteoxsJ7pSzJVC2HmDLa4iZUao7lLLbDsUj5x45/iLJcqBZK k3YnAxP2r6a+kI+1VVQY1pxdG1nlJAbdNzoojm/qmezNPSrqni61KVMQKsXBCWhIjSXDSM9CsBj21 a+9qaVqfxovJGTn9lgrZO+xzKQNMKZeOouJlscVuFj21P0ww3/YENiU/nMeTSuYypO76mDtAd08Jo nc3yuHa9MJGei5ixN3wT+IrGR2aL2hdw2M6NgH7sYbL2Zi4ugD6RXHJai1Bh2yvFSVqSQ+M6QOInT 4ud7wslm1XRB065dXtA== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.56.0 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de 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-TUID: s0k/oebSRoEO On Fri, 2025-04-04 at 11:55 +0200, Jan Kiszka wrote: > On 03.04.25 19:07, 'Badrikesh Prusty' via isar-users wrote: > > From: badrikesh prusty > >=20 > > Copy DTB_FILES to DEPLOYDIR/IMAGE_FULLNAME/KERNEL_NAME instead of > > DEPLOYDIR/. > >=20 > > An issue is observed when we attempt to build a second image for a > > machine > > utilizing DTB_FILES. During the do_copy_boot_files task of image > > creation, the > > DTB_FILES are copied to the shared location DEPLOYDIR/. > > When the > > build of a second image is triggered, it detects that the DTB_FILES > > are already > > present and avoids overwriting them. >=20 > This sounds familiar, and I think we discussed that multiple times > already. Did you study previous threads/patches, e.g. > https://patchwork.isar-build.org/project/isar/list/?series=3D1241? >=20 Yes, there were few patches that tried to solve the issue. Using subdirectory (variant similar to TS's) - https://patchwork.isar-build.org/project/isar/list/?series=3D1149 Allows to overlap files - https://patchwork.isar-build.org/project/isar/list/?series=3D1235 Make kernel deploy the files, instead of image recipes - https://patchwork.isar-build.org/project/isar/list/?series=3D1241 Finally, there is now perfect solution that would solve all possible issues and wouldn't break compatibility with downstreams... Anyway, we are planning to prepare Isar release 0.11 without the issue fix (no downstream breaking changes) and apply some (or mixed) solution after that, even at the cost of downstreams compatibility. > >=20 > > Reproducer: > > bitbake mc:phyboard-mira-bookworm:isar-image-base > > bitbake mc:phyboard-mira-bookworm:isar-image-debug > >=20 > > Copy the DTB_FILES to the directory: > > DEPLOYDIR/IMAGE_FULLNAME/KERNEL_NAME/. > > * This will allow building multiple images. > > * As each kernel recipe ships its own DTB_FILES, if a user tries to > > rebuild > > the same image with a new kernel, the DTB_FILES associated with the > > older > > kernel will not be overwritten. > >=20 > > Update the DTB_IMG variable to check for DTB_FILES in their new > > location. > > Update the WIC plugin scripts to use the DTB_FILES from their > > updated location > > within the DEPLOYDIR. > > Add IMAGE_FULLNAME and KERNEL_NAME to WICVARS to allow the scripts > > to retrieve > > these variable values during WIC image generation. > >=20 > > Signed-off-by: badrikesh prusty > > --- > > =C2=A0meta/classes/image.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 5 +++-- > > =C2=A0meta/classes/imagetypes_wic.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 6 +++--- > > =C2=A0meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 4 +++- > > =C2=A0scripts/lib/wic/plugins/source/bootimg-efi.py=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 4 +++- > > =C2=A04 files changed, 12 insertions(+), 7 deletions(-) > >=20 > > diff --git a/meta/classes/image.bbclass > > b/meta/classes/image.bbclass > > index ff3cd737..218e7c35 100644 > > --- a/meta/classes/image.bbclass > > +++ b/meta/classes/image.bbclass > > @@ -326,7 +326,7 @@ EOF > > =C2=A0KERNEL_IMG =3D "${PP_DEPLOY}/${KERNEL_IMAGE}" > > =C2=A0INITRD_IMG =3D "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" > > =C2=A0# only one dtb file supported, pick the first > > -DTB_IMG =3D "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or > > [''])[0]}" > > +DTB_IMG =3D > > "${PP_DEPLOY}/${IMAGE_FULLNAME}/${KERNEL_NAME}/${@(d.getVar('DTB_FI > > LES').split() or [''])[0]}" > >=20 > > =C2=A0do_copy_boot_files[cleandirs] +=3D "${DEPLOYDIR}" > > =C2=A0do_copy_boot_files[sstate-inputdirs] =3D "${DEPLOYDIR}" > > @@ -360,7 +360,8 @@ do_copy_boot_files() { > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 die "${file} not found" > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi > >=20 > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -f "$dtb" "${DEPLOYDIR}/= " > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mkdir -p "${DEPLOYDIR}/${IM= AGE_FULLNAME}/${KERNEL_NAME}" > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -f "$dtb" > > "${DEPLOYDIR}/${IMAGE_FULLNAME}/${KERNEL_NAME}/" > > =C2=A0=C2=A0=C2=A0=C2=A0 done > > =C2=A0} > > =C2=A0addtask 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 7a050e73..6b7b3727 100644 > > --- a/meta/classes/imagetypes_wic.bbclass > > +++ b/meta/classes/imagetypes_wic.bbclass > > @@ -102,9 +102,9 @@ WIC_DEPLOY_PARTITIONS ?=3D "0" > >=20 > > =C2=A0# taken from OE, do not touch directly > > =C2=A0WICVARS +=3D "\ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 BBLAYERS = IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD > > IMAGE_BASENAME IMAGE_BOOT_FILES IMAGE_EFI_BOOT_FILES \ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 IMAGE_LIN= K_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD > > INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ROOTFS_SI= ZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR > > TARGET_SYS TRANSLATED_TARGET_ARCH" > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 BBLAYERS = IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD > > IMAGE_BASENAME IMAGE_FULLNAME IMAGE_BOOT_FILES \ > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 IMAGE_EFI= _BOOT_FILES IMAGE_LINK_NAME IMAGE_ROOTFS > > INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR KERNEL_NAME \ > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 RECIPE_SY= SROOT_NATIVE ROOTFS_SIZE STAGING_DATADIR > > STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH" > >=20 > > =C2=A0# Isar specific vars used in our plugins > > =C2=A0WICVARS +=3D "DISTRO DISTRO_ARCH KERNEL_FILE" > > 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 78ae4fb2..5b23671f 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): > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if dtb: > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 if ';' in dtb: > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 raise WicError("Only one DTB supported, exiting= ") > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp_= cmd =3D "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ima= ge_fullname =3D get_bitbake_var("IMAGE_FULLNAME") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ker= nel_name =3D get_bitbake_var("KERNEL_NAME") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp_= cmd =3D "cp %s/%s/%s/%s %s" % (bootimg_dir, > > image_fullname, kernel_name, dtb, hdddir) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 exec_cmd(cp_cmd, True) > >=20 > > =C2=A0=C2=A0=C2=A0=C2=A0 @classmethod > > diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py > > b/scripts/lib/wic/plugins/source/bootimg-efi.py > > index 13a9cddf..cf83a6f3 100644 > > --- a/scripts/lib/wic/plugins/source/bootimg-efi.py > > +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py > > @@ -368,7 +368,9 @@ class BootimgEFIPlugin(SourcePlugin): > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 if dtb: > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if ';' in dtb: > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= raise WicError("Only one DTB supported, > > exiting") > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 dtb_path =3D "%s/%s" % (deplo= y_dir, dtb) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 image_fullname =3D > > get_bitbake_var("IMAGE_FULLNAME") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 kernel_name =3D get_bitbake_v= ar("KERNEL_NAME") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 dtb_path =3D "%s/%s/%s/%s" % = (deploy_dir, > > image_fullname, kernel_name, dtb) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 dtb_params =3D '--add-s= ection .dtb=3D%s --change- > > section-vma .dtb=3D0x%x' % \ > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 (dtb_path, dtb_off) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 linux_off =3D dtb_off + > > os.stat(dtb_path).st_size >=20 > This would affect downstream as well. You are missing a > RECIPE-API-CHANGELOG.md entry. >=20 > Jan --=20 Best regards, Uladzimir. --=20 You received this message because you are subscribed to the Google Groups "= isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/= 3d694944eb24183d241bf652c43a60d7b73aec69.camel%40ilbers.de.