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; Thu, 04 Sep 2025 11:40:39 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f60.google.com (mail-qv1-f60.google.com [209.85.219.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5849ebKE013074 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 4 Sep 2025 11:40:38 +0200 Received: by mail-qv1-f60.google.com with SMTP id 6a1803df08f44-70faf8b375csf15264086d6.0 for ; Thu, 04 Sep 2025 02:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1756978832; x=1757583632; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-sender:mime-version :subject:references:in-reply-to:message-id:to:from:date:sender:from :to:cc:subject:date:message-id:reply-to; bh=8c8XtIdwHYXdgDMg9tm9C7N6rINLW5xJrBXJnZ462NY=; b=HAjVL4kgOY2GHPFLjtMdv+QJqJOqToLSj+m5fcTI9+mipdfNdETzePx7XDb7frbixm Fh4ES2bD19f1sE6pDF20QtMGbhXtGk5Di2jOM7eTUCOKnlopNGImIaSBBLtDYWy7zcaV 7NoPaVfNPOJ84fbXFfXyqcHz0kT4If7HpAO51FI9EpBLDz4l2Vu483864W1SYVzCxrLv 8P9WwqwGzluo/1dLgR26XNiFcaHUXUaAFceC+c1s9PfBc3+1L7uM5daT1U8x/fcF0uGv zFaZjvsqB4tnUZ30QEHMVAm8QMnWslENOw90S+KYzzsrAexIiuqiyNSFQ0AuR2uzpFze 5Z7A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756978832; x=1757583632; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-sender:mime-version :subject:references:in-reply-to:message-id:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=8c8XtIdwHYXdgDMg9tm9C7N6rINLW5xJrBXJnZ462NY=; b=k/1BzSpI9PHs42OyNuLLyBqpTQjxwLzvfJjjeBn4az2aS5j3cY6NSprlbQSIRkdYUn UCiguL+rbPf6YbfvlFvkZGGkLtTqmu9jIDMTVLK5ctgGU7reAwknRNXsvpBVIVjzVrKa AJuhKzbaeqTdy2s0VTlDOO4R+U+866bgCWaNjCSENzx8aYMWjowpFF1451dCPZA/x4dd CIYB0lmDSvZQ9x/xRFCkJ5YP712jQ2HgT9E/zZ+lowGYjAdXTDIIdADJygl1AXuDU/Te +c5Ht1V1xZlGUNQPcNN9UwB004J8+DA93UXVOywtVpI52Yfh0FuySoZLP5QyuWbFp/re MsMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756978832; x=1757583632; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-sender:mime-version :subject:references:in-reply-to:message-id:to:from:date:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=8c8XtIdwHYXdgDMg9tm9C7N6rINLW5xJrBXJnZ462NY=; b=gEHcQTVT1HYb8xFz0EN7o4Xau6sfZ/gIIdHOZSQHzb9ct7tFABriB9UdMxTfHCgeJx ra2pvECmhdv0IP9F2Ihx6usqa3Ya1pvUr+dhvDi3zttd1zVVqM9oLmXySS9x5OcHBlcm Rvo6pnemUUdLloed+NSopbO5NpwzEYk7HW8vZbENKG4axjM5mnlDVQj5A2muA0SwSO2w No/QibKJOp7ud0Xi277cebrhiZSagR8AYQVUbl4KOcyPrP5GyK98PBOnv7R5Hij7CaoU p4qJ0v43ZYsHq2CQ2Y75N7u2LVtzFYemK7W2IK0QuFIpBTFQtc9+BuIuVe0qq0D6IHi8 gjaA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=1; AJvYcCXeRjnnOfPi1RGwge1qtcVzX81OWESIwocaq52lBV77S8dRUDF0Ibg/Sqaa5zqRmiphdzCF@ilbers.de X-Gm-Message-State: AOJu0YxCp1vG+E2/stuBZZ6/0zl424WBefaHXG29a3eSF25IvWCkTDcx 7Si0PVHm+cdrLeWu1KrSeKswmsy/Y6DMMb9e4qPJCU2rwF2FgH2OjpQk X-Google-Smtp-Source: AGHT+IHbdN8MqGGeVUqscP3yrilLbI5GCpeQiU+WOWRmL5zdyDRHbA4D2MS9BEKGlC+xEnXk2PoshQ== X-Received: by 2002:a05:6214:2303:b0:70d:a91d:2ec4 with SMTP id 6a1803df08f44-70fac8c41fcmr172025556d6.49.1756978831488; Thu, 04 Sep 2025 02:40:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZffISpGmY7RCZ7nCsK4CiQBJceA215T76ZWvU8PBFy6yg== Received: by 2002:a05:6214:daf:b0:70d:9fb7:756b with SMTP id 6a1803df08f44-70df03db7eals108889646d6.2.-pod-prod-03-us; Thu, 04 Sep 2025 02:40:31 -0700 (PDT) X-Received: by 2002:a05:620a:4709:b0:7fb:ebd7:bdd with SMTP id af79cd13be357-7ff26eaad0cmr2005106885a.10.1756978830931; Thu, 04 Sep 2025 02:40:30 -0700 (PDT) Received: by 2002:a05:620a:1a0a:b0:7f0:a68f:37df with SMTP id af79cd13be357-80edfc0e719ms85a; Thu, 4 Sep 2025 02:36:14 -0700 (PDT) X-Received: by 2002:a05:620a:29d3:b0:80e:159b:9aee with SMTP id af79cd13be357-80e159b9b02mr243565485a.79.1756978573295; Thu, 04 Sep 2025 02:36:13 -0700 (PDT) Date: Thu, 4 Sep 2025 02:36:12 -0700 (PDT) From: Arulpandiyan Vadivel To: isar-users Message-Id: <95421431-bec5-4297-8aba-2bd9207f1785n@googlegroups.com> In-Reply-To: <3d694944eb24183d241bf652c43a60d7b73aec69.camel@ilbers.de> References: <20250403170701.807745-1-badrikesh.prusty@siemens.com> <3d694944eb24183d241bf652c43a60d7b73aec69.camel@ilbers.de> Subject: Re: [PATCH] image: copy DTB_FILES to DEPLOYDIR/IMAGE_FULLNAME/KERNEL_NAME/ MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_522558_889695133.1756978572972" X-Original-Sender: arulcse2008@gmail.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,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-TUID: XzTCmIGEITwE ------=_Part_522558_889695133.1756978572972 Content-Type: multipart/alternative; boundary="----=_Part_522559_1723241244.1756978572972" ------=_Part_522559_1723241244.1756978572972 Content-Type: text/plain; charset="UTF-8" @Uladzimir, @Jan Kiszka As 0.11 release was out already, Can we consider merging this change? Regards, Arulpandiyan V On Friday, 4 April 2025 at 20:01:24 UTC+5:30 Uladzimir Bely wrote: > 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 > > > > > > Copy DTB_FILES to DEPLOYDIR/IMAGE_FULLNAME/KERNEL_NAME instead of > > > DEPLOYDIR/. > > > > > > 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. > > > > 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=1241? > > > > 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=1149 > Allows to overlap files > - https://patchwork.isar-build.org/project/isar/list/?series=1235 > Make kernel deploy the files, instead of image recipes > - https://patchwork.isar-build.org/project/isar/list/?series=1241 > > 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. > > > > > > > > Reproducer: > > > bitbake mc:phyboard-mira-bookworm:isar-image-base > > > bitbake mc:phyboard-mira-bookworm:isar-image-debug > > > > > > 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. > > > > > > 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. > > > > > > Signed-off-by: badrikesh prusty > > > --- > > > meta/classes/image.bbclass | 5 +++-- > > > meta/classes/imagetypes_wic.bbclass | 6 +++--- > > > meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 4 +++- > > > scripts/lib/wic/plugins/source/bootimg-efi.py | 4 +++- > > > 4 files changed, 12 insertions(+), 7 deletions(-) > > > > > > 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 > > > KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" > > > INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" > > > # only one dtb file supported, pick the first > > > -DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or > > > [''])[0]}" > > > +DTB_IMG = > > > "${PP_DEPLOY}/${IMAGE_FULLNAME}/${KERNEL_NAME}/${@(d.getVar('DTB_FI > > > LES').split() or [''])[0]}" > > > > > > do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" > > > do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" > > > @@ -360,7 +360,8 @@ do_copy_boot_files() { > > > die "${file} not found" > > > fi > > > > > > - cp -f "$dtb" "${DEPLOYDIR}/" > > > + mkdir -p "${DEPLOYDIR}/${IMAGE_FULLNAME}/${KERNEL_NAME}" > > > + cp -f "$dtb" > > > "${DEPLOYDIR}/${IMAGE_FULLNAME}/${KERNEL_NAME}/" > > > done > > > } > > > 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 7a050e73..6b7b3727 100644 > > > --- a/meta/classes/imagetypes_wic.bbclass > > > +++ b/meta/classes/imagetypes_wic.bbclass > > > @@ -102,9 +102,9 @@ WIC_DEPLOY_PARTITIONS ?= "0" > > > > > > # taken from OE, do not touch directly > > > WICVARS += "\ > > > - BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD > > > IMAGE_BASENAME IMAGE_BOOT_FILES IMAGE_EFI_BOOT_FILES \ > > > - IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD > > > INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ > > > - ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR > > > TARGET_SYS TRANSLATED_TARGET_ARCH" > > > + BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD > > > IMAGE_BASENAME IMAGE_FULLNAME IMAGE_BOOT_FILES \ > > > + IMAGE_EFI_BOOT_FILES IMAGE_LINK_NAME IMAGE_ROOTFS > > > INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR KERNEL_NAME \ > > > + RECIPE_SYSROOT_NATIVE ROOTFS_SIZE STAGING_DATADIR > > > STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH" > > > > > > # Isar specific vars used in our plugins > > > WICVARS += "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): > > > if dtb: > > > if ';' in dtb: > > > raise WicError("Only one DTB supported, exiting") > > > - cp_cmd = "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) > > > + image_fullname = get_bitbake_var("IMAGE_FULLNAME") > > > + kernel_name = get_bitbake_var("KERNEL_NAME") > > > + cp_cmd = "cp %s/%s/%s/%s %s" % (bootimg_dir, > > > image_fullname, kernel_name, dtb, hdddir) > > > exec_cmd(cp_cmd, True) > > > > > > @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): > > > if dtb: > > > if ';' in dtb: > > > raise WicError("Only one DTB supported, > > > exiting") > > > - dtb_path = "%s/%s" % (deploy_dir, dtb) > > > + image_fullname = > > > get_bitbake_var("IMAGE_FULLNAME") > > > + kernel_name = get_bitbake_var("KERNEL_NAME") > > > + dtb_path = "%s/%s/%s/%s" % (deploy_dir, > > > image_fullname, kernel_name, dtb) > > > dtb_params = '--add-section .dtb=%s --change- > > > section-vma .dtb=0x%x' % \ > > > (dtb_path, dtb_off) > > > linux_off = dtb_off + > > > os.stat(dtb_path).st_size > > > > This would affect downstream as well. You are missing a > > RECIPE-API-CHANGELOG.md entry. > > > > Jan > > -- > Best regards, > Uladzimir. > > > -- 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 email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/95421431-bec5-4297-8aba-2bd9207f1785n%40googlegroups.com. ------=_Part_522559_1723241244.1756978572972 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable @Uladzimir, @Jan Kiszk= a

As 0.11 release was out=C2=A0 already, Can we cons= ider merging this change?


Regar= ds,
Arulpandiyan V

On Friday, 4 April 2025 at 20:01:24 UT= C+5:30 Uladzimir Bely wrote:
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 <badrikes...@siemens.com>
> >=20
> > Copy DTB_FILES to DEPLOYDIR/IMAGE_FULLNAME/KERNEL_NAME instea= d 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 im= age
> > creation, the
> > DTB_FILES are copied to the shared location DEPLOYDIR/<dtb= files>.
> > 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.or= g/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/p= roject/isar/list/?series=3D1149
Allows to overlap files
- https://patchwork.isar-build.org/p= roject/isar/list/?series=3D1235
Make kernel deploy the files, instead of image recipes
- https://patchwork.isar-build.org/p= roject/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 tr= ies to
> > rebuild
> > the same image with a new kernel, the DTB_FILES associated wi= th the
> > older
> > kernel will not be overwritten.
> >=20
> > Update the DTB_IMG variable to check for DTB_FILES in their n= ew
> > 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 sc= ripts
> > to retrieve
> > these variable values during WIC image generation.
> >=20
> > Signed-off-by: badrikesh prusty <badrikes...@siemens.com>
> > ---
> > =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&#= 39;).split() or
> > [''])[0]}"
> > +DTB_IMG =3D
> > "${PP_DEPLOY}/${IMAGE_FULLNAME}/${KERNEL_NAME}/${@(d.get= Var('DTB_FI
> > LES').split() or [''])[0]}"
> >=20
> > =C2=A0do_copy_boot_files[cleandirs] +=3D "${DEPLOYDIR}&q= uot;
> > =C2=A0do_copy_boot_files[sstate-inputdirs] =3D "${DEPLOY= DIR}"
> > @@ -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&= quot; "${DEPLOYDIR}/"
> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mkdir -p "${= DEPLOYDIR}/${IMAGE_FULLNAME}/${KERNEL_NAME}"
> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -f "$dtb&= quot;
> > "${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 af= ter
> > 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_LINK_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_SIZE 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_SYSROOT_NATIVE ROOTFS_SIZE STAGING_DATADIR
> > STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH&= quot;
> >=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-isa= r.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 supp= orted, 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 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 kernel_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" % (deploy_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_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=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-section .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.


--
You received this message because you are subscribed to the Google Groups &= quot;isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-use= rs+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-use= rs/95421431-bec5-4297-8aba-2bd9207f1785n%40googlegroups.com.
------=_Part_522559_1723241244.1756978572972-- ------=_Part_522558_889695133.1756978572972--