* [PATCH 1/1] wic: Update to the latest revision
2022-05-10 12:29 [PATCH 0/1] wic: Update to the latest revision Felix Moessbauer
@ 2022-05-10 12:29 ` Felix Moessbauer
2022-05-10 14:10 ` [PATCH 0/1] " Henning Schild
1 sibling, 0 replies; 3+ messages in thread
From: Felix Moessbauer @ 2022-05-10 12:29 UTC (permalink / raw)
To: isar-users; +Cc: jan.kiszka, henning.schild, Felix Moessbauer
Update to the latest wic from OE-core.
OE-core Revision: b8878cf0d35cf3d1ac30576d9b9943a7761c011b
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
scripts/lib/wic/misc.py | 1 +
scripts/lib/wic/plugins/imager/direct.py | 2 +-
scripts/lib/wic/plugins/source/rootfs.py | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
index 3e118229..3bc165fd 100644
--- a/scripts/lib/wic/misc.py
+++ b/scripts/lib/wic/misc.py
@@ -36,6 +36,7 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools",
"mkdosfs": "dosfstools",
"mkisofs": "cdrtools",
"mkfs.btrfs": "btrfs-tools",
+ "mkfs.erofs": "erofs-utils",
"mkfs.ext2": "e2fsprogs",
"mkfs.ext3": "e2fsprogs",
"mkfs.ext4": "e2fsprogs",
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 35fff7c1..4d0b836e 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -259,7 +259,7 @@ class DirectPlugin(ImagerPlugin):
if part.mountpoint == "/":
if part.uuid:
return "PARTUUID=%s" % part.uuid
- elif part.label:
+ elif part.label and self.ptable_format != 'msdos':
return "PARTLABEL=%s" % part.label
else:
suffix = 'p' if part.disk.startswith('mmcblk') else ''
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 2e34e715..25bb41dd 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -50,7 +50,7 @@ class RootfsPlugin(SourcePlugin):
@staticmethod
def __get_rootfs_dir(rootfs_dir):
- if os.path.isdir(rootfs_dir):
+ if rootfs_dir and os.path.isdir(rootfs_dir):
return os.path.realpath(rootfs_dir)
image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir)
@@ -96,6 +96,9 @@ class RootfsPlugin(SourcePlugin):
part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab"))
pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo")
+ if not os.path.lexists(pseudo_dir):
+ pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo')
+
if not os.path.lexists(pseudo_dir):
logger.warn("%s folder does not exist. "
"Usernames and permissions will be invalid " % pseudo_dir)
--
2.30.2
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 0/1] wic: Update to the latest revision
2022-05-10 12:29 [PATCH 0/1] wic: Update to the latest revision Felix Moessbauer
2022-05-10 12:29 ` [PATCH 1/1] " Felix Moessbauer
@ 2022-05-10 14:10 ` Henning Schild
1 sibling, 0 replies; 3+ messages in thread
From: Henning Schild @ 2022-05-10 14:10 UTC (permalink / raw)
To: Felix Moessbauer; +Cc: isar-users, jan.kiszka
I am not 100% sure if it belongs into this series, but i think it would
fit well ... can we have an example wks with on mc from the CI using it?
Henning
Am Tue, 10 May 2022 14:29:05 +0200
schrieb Felix Moessbauer <felix.moessbauer@siemens.com>:
> This updates WIC to the latest OE revision, which includes
> the patch "Fix permissions when splitting rootfs folders across
> partitions".
>
> This patch already has been proposed on the ISAR ML,
> but as it is now merged upstream, we simply bump WIC.
>
> Best regards,
> Felix
>
> Felix Moessbauer (1):
> wic: Update to the latest revision
>
> scripts/lib/wic/misc.py | 1 +
> scripts/lib/wic/plugins/imager/direct.py | 2 +-
> scripts/lib/wic/plugins/source/rootfs.py | 5 ++++-
> 3 files changed, 6 insertions(+), 2 deletions(-)
>
^ permalink raw reply [flat|nested] 3+ messages in thread