diff options
Diffstat (limited to 'scripts/lib/wic')
-rw-r--r-- | scripts/lib/wic/engine.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 674ccfc244..ce7e6c5d75 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py | |||
@@ -359,7 +359,7 @@ class Disk: | |||
359 | Remove files/dirs and their contents from the partition. | 359 | Remove files/dirs and their contents from the partition. |
360 | This only applies to ext* partition. | 360 | This only applies to ext* partition. |
361 | """ | 361 | """ |
362 | abs_path = re.sub('\/\/+', '/', path) | 362 | abs_path = re.sub(r'\/\/+', '/', path) |
363 | cmd = "{} {} -wR 'rm \"{}\"'".format(self.debugfs, | 363 | cmd = "{} {} -wR 'rm \"{}\"'".format(self.debugfs, |
364 | self._get_part_image(pnum), | 364 | self._get_part_image(pnum), |
365 | abs_path) | 365 | abs_path) |
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 13a9cddf4e..7cc5131541 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): | |||
428 | elif source_params['loader'] == 'uefi-kernel': | 428 | elif source_params['loader'] == 'uefi-kernel': |
429 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") | 429 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") |
430 | if not kernel: | 430 | if not kernel: |
431 | raise WicError("Empty KERNEL_IMAGETYPE %s\n" % target) | 431 | raise WicError("Empty KERNEL_IMAGETYPE") |
432 | target = get_bitbake_var("TARGET_SYS") | 432 | target = get_bitbake_var("TARGET_SYS") |
433 | if not target: | 433 | if not target: |
434 | raise WicError("Unknown arch (TARGET_SYS) %s\n" % target) | 434 | raise WicError("Empty TARGET_SYS") |
435 | 435 | ||
436 | if re.match("x86_64", target): | 436 | if re.match("x86_64", target): |
437 | kernel_efi_image = "bootx64.efi" | 437 | kernel_efi_image = "bootx64.efi" |