From: Chee Yang Lee Date: Mon, 13 May 2019 04:07:09 +0000 (+0800) Subject: wic/bootimg-efi: replace hardcoded volume name with label X-Git-Tag: uninative-2.5~150 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5621aceaf39ef0dc097b16c83e73b9882c987a7c;p=openembedded-core.git wic/bootimg-efi: replace hardcoded volume name with label volume name should refer to --label in .wks. Replace the hardcoded volume name with label. set "ESP" as default name when no lable specified. Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 3540b08440..652323fa77 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -244,8 +244,10 @@ class BootimgEFIPlugin(SourcePlugin): # dosfs image, created by mkdosfs bootimg = "%s/boot.img" % cr_workdir - dosfs_cmd = "mkdosfs -n efi -i %s -C %s %d" % \ - (part.fsuuid, bootimg, blocks) + label = part.label if part.label else "ESP" + + dosfs_cmd = "mkdosfs -n %s -i %s -C %s %d" % \ + (label, part.fsuuid, bootimg, blocks) exec_native_cmd(dosfs_cmd, native_sysroot) mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)