[OE-core] [PATCH] isoimage-isohybrid.py: Parameterize ESP label

Haris Okanovic haris.okanovic at ni.com
Thu Nov 7 18:51:15 UTC 2019


Add "esp_label" plugin parameter so that caller may override default
ESP partition label 'EFIimg'.

Signed-off-by: Haris Okanovic <haris.okanovic at ni.com>
---
 scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 24299c1ece..95a54a09d2 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -347,8 +347,10 @@ class IsoImagePlugin(SourcePlugin):
             # dosfs image for EFI boot
             bootimg = "%s/efi.img" % isodir
 
-            dosfs_cmd = 'mkfs.vfat -n "EFIimg" -S 512 -C %s %d' \
-                        % (bootimg, blocks)
+            esp_label = source_params.get('esp_label', 'EFIimg')
+
+            dosfs_cmd = 'mkfs.vfat -n \'%s\' -S 512 -C %s %d' \
+                        % (esp_label, bootimg, blocks)
             exec_native_cmd(dosfs_cmd, native_sysroot)
 
             mmd_cmd = "mmd -i %s ::/EFI" % bootimg
-- 
2.24.0



More information about the Openembedded-core mailing list