[OE-core] [PATCH] wic/bootimg-efi: replace hardcoded volume name with label

Tom Rini trini at konsulko.com
Fri May 10 14:05:21 UTC 2019


On Fri, May 10, 2019 at 11:00:45AM +0800, chee.yang.lee at intel.com wrote:

> From: Chee Yang Lee <chee.yang.lee at intel.com>
> 
> volume name should refer to --label in .wks.
> Replace the hardcoded volume name  with label.
> Keep "efi" as default name when no lable specified.
> 
> Signed-off-by: Chee Yang Lee <chee.yang.lee at intel.com>
> ---
>  scripts/lib/wic/plugins/source/bootimg-efi.py | 6 ++++--
>  1 file 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 0a0c5bd..55202a8 100644
> --- a/scripts/lib/wic/plugins/source/bootimg-efi.py
> +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
> @@ -268,8 +268,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 "efi"
> +
> +        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)

Does the name "efi" come from some spec?  I would expect the default
name here to be "ESP".  Thanks!

-- 
Tom


More information about the Openembedded-core mailing list