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-22 00:31:49 +0100 |
commit | 34503c75b0e28c28e720404bcbc1b07769cc69bf (patch) | |
tree | 506b57e5bcdb0c0c942bb06a775f73ab451d59ed /scripts | |
parent | 2d1077bb4fc7a8789f0dace2e28e7ce217e34e84 (diff) | |
download | poky-34503c75b0e28c28e720404bcbc1b07769cc69bf.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: becb0a3f855eff7700fa284a0a7981d6a260a1c5)
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')
-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 0eb86a079f..1269818464 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -256,8 +256,10 @@ class BootimgEFIPlugin(SourcePlugin): | |||
256 | # dosfs image, created by mkdosfs | 256 | # dosfs image, created by mkdosfs |
257 | bootimg = "%s/boot.img" % cr_workdir | 257 | bootimg = "%s/boot.img" % cr_workdir |
258 | 258 | ||
259 | dosfs_cmd = "mkdosfs -n efi -i %s -C %s %d" % \ | 259 | label = part.label if part.label else "ESP" |
260 | (part.fsuuid, bootimg, blocks) | 260 | |
261 | dosfs_cmd = "mkdosfs -n %s -i %s -C %s %d" % \ | ||
262 | (label, part.fsuuid, bootimg, blocks) | ||
261 | exec_native_cmd(dosfs_cmd, native_sysroot) | 263 | exec_native_cmd(dosfs_cmd, native_sysroot) |
262 | 264 | ||
263 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) | 265 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) |