| Message ID | 20260619072238.52120-2-amikan@ilbers.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/7] wic: Update libs to v5.0.3 | expand |
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 674ccfc2..ce7e6c5d 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -359,7 +359,7 @@ class Disk: Remove files/dirs and their contents from the partition. This only applies to ext* partition. """ - abs_path = re.sub('\/\/+', '/', path) + abs_path = re.sub(r'\/\/+', '/', path) cmd = "{} {} -wR 'rm \"{}\"'".format(self.debugfs, self._get_part_image(pnum), abs_path) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 13a9cddf..7cc51315 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -428,10 +428,10 @@ class BootimgEFIPlugin(SourcePlugin): elif source_params['loader'] == 'uefi-kernel': kernel = get_bitbake_var("KERNEL_IMAGETYPE") if not kernel: - raise WicError("Empty KERNEL_IMAGETYPE %s\n" % target) + raise WicError("Empty KERNEL_IMAGETYPE") target = get_bitbake_var("TARGET_SYS") if not target: - raise WicError("Unknown arch (TARGET_SYS) %s\n" % target) + raise WicError("Empty TARGET_SYS") if re.match("x86_64", target): kernel_efi_image = "bootx64.efi" diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index 94183174..1071d1af 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -1,5 +1,5 @@ # -# Imported from openembedded-core +# Copyright OpenEmbedded Contributors # # SPDX-License-Identifier: GPL-2.0-only # diff --git a/scripts/lib/wic/plugins/source/empty.py b/scripts/lib/wic/plugins/source/empty.py index c1903ca5..41789123 100644 --- a/scripts/lib/wic/plugins/source/empty.py +++ b/scripts/lib/wic/plugins/source/empty.py @@ -1,5 +1,5 @@ # -# Imported from openembedded-core +# Copyright OpenEmbedded Contributors # # SPDX-License-Identifier: MIT # diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index afc9ea0f..607356ad 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -1,4 +1,6 @@ # +# Copyright OpenEmbedded Contributors +# # SPDX-License-Identifier: GPL-2.0-only # # DESCRIPTION diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 73017e86..21903c2f 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -1,5 +1,5 @@ # -# Imported from openembedded-core +# Copyright OpenEmbedded Contributors # # SPDX-License-Identifier: GPL-2.0-only # diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index c990143c..e29f3a4c 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -43,7 +43,7 @@ class RootfsPlugin(SourcePlugin): # directory, or modify a directory outside OpenEmbedded). full_path = os.path.realpath(os.path.join(rootfs_dir, path)) if not full_path.startswith(os.path.realpath(rootfs_dir)): - logger.error("%s: Must point inside the rootfs: %s" % (cmd, path)) + logger.error("%s: Must point inside the rootfs:" % (cmd, path)) sys.exit(1) return full_path
OE-core Revision: 236ac1b43308df722a78d3aa20aef065dfae5b2b. Following changes are left because they are still needed in Isar: d70553ae wic: Restore compatibility with old distros a4237f08 wic/plugins/images/direct: Allow changes in fstab on rootfs Signed-off-by: Anton Mikanovich <amikan@ilbers.de> --- scripts/lib/wic/engine.py | 2 +- scripts/lib/wic/plugins/source/bootimg-efi.py | 4 ++-- scripts/lib/wic/plugins/source/bootimg-partition.py | 2 +- scripts/lib/wic/plugins/source/empty.py | 2 +- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 2 ++ scripts/lib/wic/plugins/source/rawcopy.py | 2 +- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-)