summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaris Okanovic <haris.okanovic@ni.com>2019-11-07 12:51:15 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-10 14:06:10 +0000
commit36bb63c3d24aca805cccf465789749d04f90902c (patch)
tree9152f8c4db3707d2088b54cf51f77d6716de5a0f
parent290e90d5a23c15b4c8e1e6102f9efe98f6c4d646 (diff)
downloadpoky-36bb63c3d24aca805cccf465789749d04f90902c.tar.gz
isoimage-isohybrid.py: Parameterize ESP label
Add "esp_label" plugin parameter so that caller may override default ESP partition label 'EFIimg'. (From OE-Core rev: 6b3b9042a55d47205b16ef792f93a9bb240fd7cb) Signed-off-by: Haris Okanovic <haris.okanovic@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py6
1 files 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):
347 # dosfs image for EFI boot 347 # dosfs image for EFI boot
348 bootimg = "%s/efi.img" % isodir 348 bootimg = "%s/efi.img" % isodir
349 349
350 dosfs_cmd = 'mkfs.vfat -n "EFIimg" -S 512 -C %s %d' \ 350 esp_label = source_params.get('esp_label', 'EFIimg')
351 % (bootimg, blocks) 351
352 dosfs_cmd = 'mkfs.vfat -n \'%s\' -S 512 -C %s %d' \
353 % (esp_label, bootimg, blocks)
352 exec_native_cmd(dosfs_cmd, native_sysroot) 354 exec_native_cmd(dosfs_cmd, native_sysroot)
353 355
354 mmd_cmd = "mmd -i %s ::/EFI" % bootimg 356 mmd_cmd = "mmd -i %s ::/EFI" % bootimg