On Sat 2026-06-27 @ 12:51:14 AM, Yoann Congal via lists.openembedded.org wrote:
> On Sun Jun 21, 2026 at 10:25 PM CEST, Aleksandar Nikolic via
> lists.openembedded.org wrote:
> > From: Aleksandar Nikolic <[email protected]>
> >
> > In case wks file references nvme, update_fstab() function will not add
> > prefix 'p' before the partition number, as the if condition only takes
> > mmcblk into consideration.
> >
> > In case of nvme0n1 this leads that following entries are added to fstab:
> >
> > /dev/nvme0n11
> > /dev/nvme0n13
> >
> > instead of:
> >
> > /dev/nvme0n1p1
> > /dev/nvme0n1p3
> >
> > The patch fixes this as it extends the if condition and adds prefix 'p' for
> > both mmcblk and nvme.
> >
> > Upstream-Status: Backport
> > [https://git.yoctoproject.org/wic/commit/?id=f20cda73b495b75ef399c331f59b0e2401a3e76a]
> > Signed-off-by: Aleksandar Nikolic <[email protected]>
>
> Hello,
>
> Sorry I missed it in earlier reviews but it look like this patch is also
> needed on wrynose: wrynose has wic 0.3.0 but this patch is 2 commits
> above that.
>
> To accept this patch on scarthgap, I would need a equivalent patch for
> wrynose. Can you send that and ping back here?
In scarthgap wic is part of oe-core, in wrynose it is not.
For wrynose it would require a completely different patch; but it would
probably be best to just update the SRCREV instead.
> Thanks!
>
> > ---
> > scripts/lib/wic/plugins/imager/direct.py | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/scripts/lib/wic/plugins/imager/direct.py
> > b/scripts/lib/wic/plugins/imager/direct.py
> > index a1d152659b..b06e6a8f23 100644
> > --- a/scripts/lib/wic/plugins/imager/direct.py
> > +++ b/scripts/lib/wic/plugins/imager/direct.py
> > @@ -133,8 +133,8 @@ class DirectPlugin(ImagerPlugin):
> > elif part.use_label:
> > device_name = "LABEL=%s" % part.label
> > else:
> > - # mmc device partitions are named mmcblk0p1, mmcblk0p2..
> > - prefix = 'p' if part.disk.startswith('mmcblk') else ''
> > + # mmc and nvme device partitions start with prefix 'p'
> > + prefix = 'p' if part.disk.startswith(('mmcblk', 'nvme'))
> > else ''
> > device_name = "/dev/%s%s%d" % (part.disk, prefix,
> > part.realnum)
> >
> > opts = part.fsopts if part.fsopts else "defaults"
> > @@ -266,7 +266,7 @@ class DirectPlugin(ImagerPlugin):
> > elif part.label and self.ptable_format != 'msdos':
> > return "PARTLABEL=%s" % part.label
> > else:
> > - suffix = 'p' if part.disk.startswith('mmcblk') else ''
> > + suffix = 'p' if part.disk.startswith(('mmcblk',
> > 'nvme')) else ''
> > return "/dev/%s%s%-d" % (part.disk, suffix,
> > part.realnum)
> >
> > def cleanup(self):
>
>
> --
> Yoann Congal
> Smile ECS
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#239670):
https://lists.openembedded.org/g/openembedded-core/message/239670
Mute This Topic: https://lists.openembedded.org/mt/119915320/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
