diff options
author | Chee Yang Lee <chee.yang.lee@intel.com> | 2019-05-13 12:07:09 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-15 17:53:29 +0100 |
commit | 92cc79f4e645b0d4bc59c1b2f12562acbae08fbe (patch) | |
tree | e2964a7c3e573382c46ff9efc74db7e81dbb6240 /scripts | |
parent | c7770d5c1c9e4e0c30b89cf72f3dc6596a719910 (diff) | |
download | poky-92cc79f4e645b0d4bc59c1b2f12562acbae08fbe.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: 5621aceaf39ef0dc097b16c83e73b9882c987a7c)
Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 6 |
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 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): | |||
244 | # dosfs image, created by mkdosfs | 244 | # dosfs image, created by mkdosfs |
245 | bootimg = "%s/boot.img" % cr_workdir | 245 | bootimg = "%s/boot.img" % cr_workdir |
246 | 246 | ||
247 | dosfs_cmd = "mkdosfs -n efi -i %s -C %s %d" % \ | 247 | label = part.label if part.label else "ESP" |
248 | (part.fsuuid, bootimg, blocks) | 248 | |
249 | dosfs_cmd = "mkdosfs -n %s -i %s -C %s %d" % \ | ||
250 | (label, part.fsuuid, bootimg, blocks) | ||
249 | exec_native_cmd(dosfs_cmd, native_sysroot) | 251 | exec_native_cmd(dosfs_cmd, native_sysroot) |
250 | 252 | ||
251 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) | 253 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) |