summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/bootimg-efi.py
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@foundries.io>2025-04-17 10:11:00 +0100
committerSteve Sakoman <steve@sakoman.com>2025-04-28 08:18:53 -0700
commit8b22b1239b5c84c2e2e6bec14870cbf56f94d570 (patch)
tree3ae660ccc8d89b50b0af03ecc18f0cde8e54a223 /scripts/lib/wic/plugins/source/bootimg-efi.py
parent26b25ba6733c803a5331c48aebb267314fdab6c6 (diff)
downloadpoky-8b22b1239b5c84c2e2e6bec14870cbf56f94d570.tar.gz
wic: bootimg-efi: Support + symbol in filenames
Allow the '+' symbol as a valid character in filenames listed in the IMAGE_EFI_BOOT_FILES variable. The '+' symbol might be used to support boot counting for boot entries, as described in the UAPI Boot Loader Specification [1]: The boot counting data is stored in the name of the boot loader entry. A boot loader entry file name may contain a plus (+) followed by a number. This may optionally be followed by a minus (-) followed by a second number. The dot (.) and file name suffix (conf or efi) must immediately follow. Boot counting is enabled for entries which match this pattern. Example: IMAGE_EFI_BOOT_FILES:append = " entry.conf;loader/entries/entry+3.conf" [1] https://uapi-group.org/specifications/specs/boot_loader_specification/#boot-counting (From OE-Core rev: 081fa0ebb33dbbfd0f6e8239690261c0a9dcdb2c) Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3f25822281eb9423ff86105eaebb0bed48663648) Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-efi.py')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 7cc5131541..37d07093f5 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -245,7 +245,7 @@ class BootimgEFIPlugin(SourcePlugin):
245 245
246 # list of tuples (src_name, dst_name) 246 # list of tuples (src_name, dst_name)
247 deploy_files = [] 247 deploy_files = []
248 for src_entry in re.findall(r'[\w;\-\./\*]+', boot_files): 248 for src_entry in re.findall(r'[\w;\-\.\+/\*]+', boot_files):
249 if ';' in src_entry: 249 if ';' in src_entry:
250 dst_entry = tuple(src_entry.split(';')) 250 dst_entry = tuple(src_entry.split(';'))
251 if not dst_entry[0] or not dst_entry[1]: 251 if not dst_entry[0] or not dst_entry[1]: