summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorChee Yang Lee <chee.yang.lee@intel.com>2019-05-13 12:07:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-07 13:57:48 +0100
commitcd8f2b0017db2031936746952e99b7a41e9df01a (patch)
tree2b194e6d687b993fdbd8cb29ce6c5d974f507830 /scripts/lib
parent05140c22ce45a3cb6fe1bc9389031097c5d8fa6a (diff)
downloadpoky-cd8f2b0017db2031936746952e99b7a41e9df01a.tar.gz
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. (From OE-Core rev: b67ac8283987e3bba429da25249e6d3c11a846d6) Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 83a7e189ed..19328ce785 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -258,8 +258,10 @@ class BootimgEFIPlugin(SourcePlugin):
258 # dosfs image, created by mkdosfs 258 # dosfs image, created by mkdosfs
259 bootimg = "%s/boot.img" % cr_workdir 259 bootimg = "%s/boot.img" % cr_workdir
260 260
261 dosfs_cmd = "mkdosfs -n efi -i %s -C %s %d" % \ 261 label = part.label if part.label else "ESP"
262 (part.fsuuid, bootimg, blocks) 262
263 dosfs_cmd = "mkdosfs -n %s -i %s -C %s %d" % \
264 (label, part.fsuuid, bootimg, blocks)
263 exec_native_cmd(dosfs_cmd, native_sysroot) 265 exec_native_cmd(dosfs_cmd, native_sysroot)
264 266
265 mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) 267 mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)