From: Haris Okanovic <haris.okanovic@ni.com>
Date: Thu, 7 Nov 2019 18:51:15 +0000 (-0600)
Subject: isoimage-isohybrid.py: Parameterize ESP label
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~12824
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b3b9042a55d47205b16ef792f93a9bb240fd7cb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

isoimage-isohybrid.py: Parameterize ESP label

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

Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 24299c1ece1..95a54a09d21 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