[PATCH 1/1] Re-add .wic prefix to deployed bmap file

[PATCH 1/1] Re-add .wic prefix to deployed bmap file

[Felix Moessbauer]

This patch fixes a regression introduced in edc10d9.
The bmap corresponds to the .wic file, hence it should also contain the
.wic part of the filename.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/imagetypes_wic.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
index c0f3429a..3869525b 100644
--- a/meta/classes/imagetypes_wic.bbclass
+++ b/meta/classes/imagetypes_wic.bbclass
@@ -208,7 +208,7 @@ generate_wic_image() {
     WIC_DIRECT=$(ls -t -1 ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head -1)
     sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP}
     mv -f ${WIC_DIRECT} ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic
-    mv -f ${WIC_DIRECT}.bmap ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.bmap
+    mv -f ${WIC_DIRECT}.bmap ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.bmap
     # deploy partition files if requested (ending with .p<x>)
     if [ "${WIC_DEPLOY_PARTITIONS}" -eq "1" ]; then
         # locate *.direct.p<x> partition files
-- 
2.30.2

Re: [PATCH 1/1] Re-add .wic prefix to deployed bmap file

[Roberto A. Foglietta]

Il giorno ven 14 ott 2022 alle ore 13:51 Felix Moessbauer
<felix.moessbauer@siemens.com> ha scritto:
>
> This patch fixes a regression introduced in edc10d9.
> The bmap corresponds to the .wic file, hence it should also contain the
> .wic part of the filename.
>

Thanks for this patch. However, the bmap tool works even if the name
of that file is changed.

bmaptool: info: discovered bmap file
'build/tmp/deploy/images/debx86/eval-image-debian-bullseye-debx86.bmap'
bmaptool: info: block map format version 2.0
bmaptool: info: 28902116 blocks of size 4096 (110.3 GiB), mapped
2455011 blocks (9.4 GiB or 8.5%)
bmaptool: info: copying image 'eval-image-debian-bullseye-debx86.wic'
to block device '/dev/sdb' using bmap file
'eval-image-debian-bullseye-debx86.bmap'
bmaptool: info: 0% copied

Best regards, R-

Re: [PATCH 1/1] Re-add .wic prefix to deployed bmap file

[Henning Schild]

Am Sat, 15 Oct 2022 11:37:58 +0200
schrieb "Roberto A. Foglietta" <roberto.foglietta@gmail.com>:

> Il giorno ven 14 ott 2022 alle ore 13:51 Felix Moessbauer
> <felix.moessbauer@siemens.com> ha scritto:
> >
> > This patch fixes a regression introduced in edc10d9.
> > The bmap corresponds to the .wic file, hence it should also contain
> > the .wic part of the filename.
> >  
> 
> Thanks for this patch. However, the bmap tool works even if the name
> of that file is changed.

It sure does. But any scripting that comes after an isar build could
get confused by the name change and not find the file. Like CD not even
deploying it.

regards,
Henning

> bmaptool: info: discovered bmap file
> 'build/tmp/deploy/images/debx86/eval-image-debian-bullseye-debx86.bmap'
> bmaptool: info: block map format version 2.0
> bmaptool: info: 28902116 blocks of size 4096 (110.3 GiB), mapped
> 2455011 blocks (9.4 GiB or 8.5%)
> bmaptool: info: copying image 'eval-image-debian-bullseye-debx86.wic'
> to block device '/dev/sdb' using bmap file
> 'eval-image-debian-bullseye-debx86.bmap'
> bmaptool: info: 0% copied
> 
> Best regards, R-
> 

Re: [PATCH 1/1] Re-add .wic prefix to deployed bmap file

[Roberto A. Foglietta]

Il giorno sab 15 ott 2022 alle ore 12:50 Henning Schild
<henning.schild@siemens.com> ha scritto:
>
> Am Sat, 15 Oct 2022 11:37:58 +0200
> schrieb "Roberto A. Foglietta" <roberto.foglietta@gmail.com>:
>
> > Il giorno ven 14 ott 2022 alle ore 13:51 Felix Moessbauer
> > <felix.moessbauer@siemens.com> ha scritto:
> > >
> > > This patch fixes a regression introduced in edc10d9.
> > > The bmap corresponds to the .wic file, hence it should also contain
> > > the .wic part of the filename.
> > >
> >
> > Thanks for this patch. However, the bmap tool works even if the name
> > of that file is changed.
>
> It sure does. But any scripting that comes after an isar build could
> get confused by the name change and not find the file. Like CD not even
> deploying it.

just a matter of generalisation... :-)
wicinst.sh supports .wic.bmap or .bmap, both
https://github.com/robang74/isar-nvidia-debian/commit/f305954bf7934209084e9cd4c363f3cb1ca4b1d0
Best regards, R-

RE: [PATCH 1/1] Re-add .wic prefix to deployed bmap file

[MOESSBAUER, FELIX JONATHAN]

> -----Original Message-----
> From: Roberto A. Foglietta <roberto.foglietta@gmail.com>
> Sent: Sunday, October 16, 2022 1:10 AM
> To: Schild, Henning (T CED SES-DE) <henning.schild@siemens.com>
> Cc: Moessbauer, Felix Jonathan (T CED INW-CN)
> <felix.moessbauer@siemens.com>; isar-users@googlegroups.com; Schmidt,
> Adriaan (T CED SES-DE) <adriaan.schmidt@siemens.com>; Kiszka, Jan (T CED)
> <jan.kiszka@siemens.com>
> Subject: Re: [PATCH 1/1] Re-add .wic prefix to deployed bmap file
> 
> Il giorno sab 15 ott 2022 alle ore 12:50 Henning Schild
> <henning.schild@siemens.com> ha scritto:
> >
> > Am Sat, 15 Oct 2022 11:37:58 +0200
> > schrieb "Roberto A. Foglietta" <roberto.foglietta@gmail.com>:
> >
> > > Il giorno ven 14 ott 2022 alle ore 13:51 Felix Moessbauer
> > > <felix.moessbauer@siemens.com> ha scritto:
> > > >
> > > > This patch fixes a regression introduced in edc10d9.
> > > > The bmap corresponds to the .wic file, hence it should also
> > > > contain the .wic part of the filename.
> > > >
> > >
> > > Thanks for this patch. However, the bmap tool works even if the name
> > > of that file is changed.
> >
> > It sure does. But any scripting that comes after an isar build could
> > get confused by the name change and not find the file. Like CD not
> > even deploying it.
> 
> just a matter of generalisation... :-)

Too much generalization might just break things.
The bmap file is specific to a block file, like the<image> .wic one.
There might be other imagers or deployment formats, that use a different bmap.
An with ISARs imagetypes, you can generate multiple image formats / types in a single run.
Each of these could - in theory - have its own bmap, hence just appending .bmap to the image filename is not sufficient.

In short - it's a bug I re-introduced by reverting a commit.
And this patch provides the fix. That's it.

Felix

> wicinst.sh supports .wic.bmap or .bmap, both
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.co
> m%2Frobang74%2Fisar-nvidia-
> debian%2Fcommit%2Ff305954bf7934209084e9cd4c363f3cb1ca4b1d0&amp;dat
> a=05%7C01%7Cfelix.moessbauer%40siemens.com%7C9bec179e83d64168bf6c0
> 8daaed01d2c%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C638014
> 506115197709%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIj
> oiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdat
> a=izsy%2FYcg1Kqflnk1nmJKEe5UC42SQv4MKhb2H%2F6JFIA%3D&amp;reserved
> =0
> Best regards, R-

Re: [PATCH 1/1] Re-add .wic prefix to deployed bmap file

[Roberto A. Foglietta]

Il giorno dom 16 ott 2022 alle ore 05:58 MOESSBAUER, FELIX JONATHAN
<felix.moessbauer@siemens.com> ha scritto:
>
> > -----Original Message-----
> > From: Roberto A. Foglietta <roberto.foglietta@gmail.com>
> > Sent: Sunday, October 16, 2022 1:10 AM
> > To: Schild, Henning (T CED SES-DE) <henning.schild@siemens.com>
> > Cc: Moessbauer, Felix Jonathan (T CED INW-CN)
> > <felix.moessbauer@siemens.com>; isar-users@googlegroups.com; Schmidt,
> > Adriaan (T CED SES-DE) <adriaan.schmidt@siemens.com>; Kiszka, Jan (T CED)
> > <jan.kiszka@siemens.com>
> > Subject: Re: [PATCH 1/1] Re-add .wic prefix to deployed bmap file
> >
> > Il giorno sab 15 ott 2022 alle ore 12:50 Henning Schild
> > <henning.schild@siemens.com> ha scritto:
> > >
> > > Am Sat, 15 Oct 2022 11:37:58 +0200
> > > schrieb "Roberto A. Foglietta" <roberto.foglietta@gmail.com>:
> > >
> > > > Il giorno ven 14 ott 2022 alle ore 13:51 Felix Moessbauer
> > > > <felix.moessbauer@siemens.com> ha scritto:
> > > > >
> > > > > This patch fixes a regression introduced in edc10d9.
> > > > > The bmap corresponds to the .wic file, hence it should also
> > > > > contain the .wic part of the filename.
> > > > >
> > > >
> > > > Thanks for this patch. However, the bmap tool works even if the name
> > > > of that file is changed.
> > >
> > > It sure does. But any scripting that comes after an isar build could
> > > get confused by the name change and not find the file. Like CD not
> > > even deploying it.
> >
> > just a matter of generalisation... :-)
>
> Too much generalization might just break things.
> The bmap file is specific to a block file, like the<image> .wic one.
> There might be other imagers or deployment formats, that use a different bmap.
> An with ISARs imagetypes, you can generate multiple image formats / types in a single run.
> Each of these could - in theory - have its own bmap, hence just appending .bmap to the image filename is not sufficient.
>

Thanks for the explanation. I wait for this patch to get accepted into
the 'next' and I will update the kas.yml with the new hash.

Best regards, R-

Re: [PATCH 1/1] Re-add .wic prefix to deployed bmap file

[Anton Mikanovich]

14.10.2022 14:51, Felix Moessbauer wrote:
> This patch fixes a regression introduced in edc10d9.
> The bmap corresponds to the .wic file, hence it should also contain the
> .wic part of the filename.
>
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>

Applied to next, thanks.