aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbouchard <jeanbouch418@gmail.com>2021-06-27 20:28:37 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-29 22:18:21 +0100
commit0fd7a73c1bd2486b7a022f0f69bbcb2e0d9cb141 (patch)
tree67d154cb2dd4bba44462caa3eb3c3a2cd4dd2c89
parentce549ff785db6e47392c30cca725661b421db7c9 (diff)
downloadopenembedded-core-contrib-0fd7a73c1bd2486b7a022f0f69bbcb2e0d9cb141.tar.gz
openembedded-core-contrib-0fd7a73c1bd2486b7a022f0f69bbcb2e0d9cb141.tar.bz2
openembedded-core-contrib-0fd7a73c1bd2486b7a022f0f69bbcb2e0d9cb141.zip
Use the label provided when formating a dos partition
Previously the bootimg-pcbios wic plugin was not respecting the --label option provided from the wks file. The plugin was setting the label to 'boot'. With this fix, the --label option is use. If no option are specified, then the default is 'boot'. Signed-off-by: jbouchard <jeanbouch418@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index f2639e70049..32e47f18314 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -186,8 +186,10 @@ class BootimgPcbiosPlugin(SourcePlugin):
# dosfs image, created by mkdosfs
bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno)
- dosfs_cmd = "mkdosfs -n boot -i %s -S 512 -C %s %d" % \
- (part.fsuuid, bootimg, blocks)
+ label = part.label if part.label else "boot"
+
+ dosfs_cmd = "mkdosfs -n %s -i %s -S 512 -C %s %d" % \
+ (label, part.fsuuid, bootimg, blocks)
exec_native_cmd(dosfs_cmd, native_sysroot)
mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)