diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-pcbios.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index f2639e7004..a207a83530 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -122,7 +122,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
122 | syslinux_conf += "DEFAULT boot\n" | 122 | syslinux_conf += "DEFAULT boot\n" |
123 | syslinux_conf += "LABEL boot\n" | 123 | syslinux_conf += "LABEL boot\n" |
124 | 124 | ||
125 | kernel = "/vmlinuz" | 125 | kernel = "/" + get_bitbake_var("KERNEL_IMAGETYPE") |
126 | syslinux_conf += "KERNEL " + kernel + "\n" | 126 | syslinux_conf += "KERNEL " + kernel + "\n" |
127 | 127 | ||
128 | syslinux_conf += "APPEND label=boot root=%s %s\n" % \ | 128 | syslinux_conf += "APPEND label=boot root=%s %s\n" % \ |
@@ -155,8 +155,8 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
155 | kernel = "%s-%s.bin" % \ | 155 | kernel = "%s-%s.bin" % \ |
156 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) | 156 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) |
157 | 157 | ||
158 | cmds = ("install -m 0644 %s/%s %s/vmlinuz" % | 158 | cmds = ("install -m 0644 %s/%s %s/%s" % |
159 | (staging_kernel_dir, kernel, hdddir), | 159 | (staging_kernel_dir, kernel, hdddir, get_bitbake_var("KERNEL_IMAGETYPE")), |
160 | "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" % | 160 | "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" % |
161 | (bootimg_dir, hdddir), | 161 | (bootimg_dir, hdddir), |
162 | "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" % | 162 | "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" % |
@@ -186,8 +186,10 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
186 | # dosfs image, created by mkdosfs | 186 | # dosfs image, created by mkdosfs |
187 | bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno) | 187 | bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno) |
188 | 188 | ||
189 | dosfs_cmd = "mkdosfs -n boot -i %s -S 512 -C %s %d" % \ | 189 | label = part.label if part.label else "boot" |
190 | (part.fsuuid, bootimg, blocks) | 190 | |
191 | dosfs_cmd = "mkdosfs -n %s -i %s -S 512 -C %s %d" % \ | ||
192 | (label, part.fsuuid, bootimg, blocks) | ||
191 | exec_native_cmd(dosfs_cmd, native_sysroot) | 193 | exec_native_cmd(dosfs_cmd, native_sysroot) |
192 | 194 | ||
193 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) | 195 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) |