mbox

[0/2] Update wic to bring in fspassno feature

Message ID 20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com
State Superseded, archived
Headers show

Message

Vijai Kumar K June 10, 2022, 3:39 a.m. UTC
The series has 2 patches.

P1: updates isar wks files to handle the uprev without breakage
P2: Uprev of wic

This uprevision is needed to bring in the fspassno feature from oe-core.

https://github.com/openembedded/openembedded-core/commit/20d43a2599d7622b96e2fb0da87a886da1a3794a
https://github.com/openembedded/openembedded-core/commit/b9b9f71e6f37bfbf954ade518391b242669481e3

Note: Targeting for the 0.9 release.

Thanks,
Vijai Kumar K

Vijai Kumar K (2):
  meta-isar/wks: prepare wks for wic uprev
  wic: Update to the latest revision

 meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/hikey.wks           | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks   | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in   | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks       | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks  | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks     | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks    | 2 +-
 meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in   | 2 +-
 scripts/lib/wic/help.py                                  | 6 ++++++
 scripts/lib/wic/ksparser.py                              | 1 +
 scripts/lib/wic/partition.py                             | 1 +
 scripts/lib/wic/plugins/imager/direct.py                 | 5 +++--
 15 files changed, 22 insertions(+), 13 deletions(-)

Comments

Jan Kiszka June 13, 2022, 7:15 a.m. UTC | #1
On 10.06.22 13:39, Vijai Kumar K wrote:
> The series has 2 patches.
> 
> P1: updates isar wks files to handle the uprev without breakage
> P2: Uprev of wic
> 
> This uprevision is needed to bring in the fspassno feature from oe-core.
> 
> https://github.com/openembedded/openembedded-core/commit/20d43a2599d7622b96e2fb0da87a886da1a3794a
> https://github.com/openembedded/openembedded-core/commit/b9b9f71e6f37bfbf954ade518391b242669481e3
> 
> Note: Targeting for the 0.9 release.
> 

Not being a fix, this is post 0.9 material.

But wasn't there another wic update for that time pending already?

Jan

> Thanks,
> Vijai Kumar K
> 
> Vijai Kumar K (2):
>   meta-isar/wks: prepare wks for wic uprev
>   wic: Update to the latest revision
> 
>  meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/hikey.wks           | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks   | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in   | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks       | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks  | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks     | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks    | 2 +-
>  meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in   | 2 +-
>  scripts/lib/wic/help.py                                  | 6 ++++++
>  scripts/lib/wic/ksparser.py                              | 1 +
>  scripts/lib/wic/partition.py                             | 1 +
>  scripts/lib/wic/plugins/imager/direct.py                 | 5 +++--
>  15 files changed, 22 insertions(+), 13 deletions(-)
>
Anton Mikanovich June 13, 2022, 7:21 a.m. UTC | #2
13.06.2022 10:15, Jan Kiszka wrote:
> But wasn't there another wic update for that time pending already?
The latest WIC update from Felix was already merged to next at 03.06.22, 
but CI test for it is still pending.
Anyway both next WIC update and CI test for WIC will be applied after 
release.
Vijai Kumar K June 13, 2022, 7:32 a.m. UTC | #3
> -----Original Message-----
> From: Jan Kiszka <jan.kiszka@siemens.com>
> Sent: 13 June 2022 12:45
> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; isar-
> users@googlegroups.com
> Cc: henning.schild@siemens.com
> Subject: Re: [PATCH 0/2] Update wic to bring in fspassno feature
> 
> On 10.06.22 13:39, Vijai Kumar K wrote:
> > The series has 2 patches.
> >
> > P1: updates isar wks files to handle the uprev without breakage
> > P2: Uprev of wic
> >
> > This uprevision is needed to bring in the fspassno feature from oe-core.
> >
> > https://github.com/openembedded/openembedded-
> core/commit/20d43a2599d76
> > 22b96e2fb0da87a886da1a3794a
> > https://github.com/openembedded/openembedded-
> core/commit/b9b9f71e6f37b
> > fbf954ade518391b242669481e3
> >
> > Note: Targeting for the 0.9 release.
> >
> 
> Not being a fix, this is post 0.9 material.

Ah. I was really hoping this to get in. I missed the merge window for rc1.

That being said, it should be fine. I could still use the next branch.

> 
> But wasn't there another wic update for that time pending already?

The one from Felix[1] was already merged and is part of rc1. This patch just pulls two patches on top of it. But not a fix and has potentially breaking change.

I should put an entry in Changelog. With these changes we can no longer assume "/" mount point to be ignored by wic. We have to explicitly drop them.
So any downstream wks files that runs on this assumption should be fixed like P1 of this patch. If not we could potentially end up with duplicate entries for "/".

[1] https://groups.google.com/g/isar-users/c/5D-64v5qhWY/m/UW7uZJrCAAAJ

- Vijai Kumar K


> 
> Jan
> 
> > Thanks,
> > Vijai Kumar K
> >
> > Vijai Kumar K (2):
> >   meta-isar/wks: prepare wks for wic uprev
> >   wic: Update to the latest revision
> >
> >  meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc | 2 +-
> > meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in | 2 +-
> > meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/hikey.wks           | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks   | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in   | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks       | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks  | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks     | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks    | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in   | 2 +-
> >  scripts/lib/wic/help.py                                  | 6 ++++++
> >  scripts/lib/wic/ksparser.py                              | 1 +
> >  scripts/lib/wic/partition.py                             | 1 +
> >  scripts/lib/wic/plugins/imager/direct.py                 | 5 +++--
> >  15 files changed, 22 insertions(+), 13 deletions(-)
> >
> 
> --
> Siemens AG, Technology
> Competence Center Embedded Linux
Henning Schild June 13, 2022, 8:31 a.m. UTC | #4
Am Mon, 13 Jun 2022 09:15:05 +0200
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 10.06.22 13:39, Vijai Kumar K wrote:
> > The series has 2 patches.
> > 
> > P1: updates isar wks files to handle the uprev without breakage
> > P2: Uprev of wic
> > 
> > This uprevision is needed to bring in the fspassno feature from
> > oe-core.
> > 
> > https://github.com/openembedded/openembedded-core/commit/20d43a2599d7622b96e2fb0da87a886da1a3794a
> > https://github.com/openembedded/openembedded-core/commit/b9b9f71e6f37bfbf954ade518391b242669481e3
> > 
> > Note: Targeting for the 0.9 release.
> >   
> 
> Not being a fix, this is post 0.9 material.
> 
> But wasn't there another wic update for that time pending already?

There was a wic bump from Felix, which should be followed by this one.
This second bump deals with controlling rootfs flags in fstab coming
via wic.
Tobias needs it for some growfs aspects but i think he can wait until
after 0.9, and Vijai needs it for fspassno ... which can probably also
wait.

What Tobias proposed for growfs without fstab-flags is imho going into
0.9.

Henning

> Jan
> 
> > Thanks,
> > Vijai Kumar K
> > 
> > Vijai Kumar K (2):
> >   meta-isar/wks: prepare wks for wic uprev
> >   wic: Update to the latest revision
> > 
> >  meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/hikey.wks           | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks   | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in   | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks       | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks  | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks     | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks    | 2 +-
> >  meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in   | 2 +-
> >  scripts/lib/wic/help.py                                  | 6 ++++++
> >  scripts/lib/wic/ksparser.py                              | 1 +
> >  scripts/lib/wic/partition.py                             | 1 +
> >  scripts/lib/wic/plugins/imager/direct.py                 | 5 +++--
> >  15 files changed, 22 insertions(+), 13 deletions(-)
> >   
>