@@ -94,27 +94,19 @@ class BootimgPcbiosPlugin(SourcePlugin):
Called after all partitions have been prepared and assembled into a
disk image. In this case, we install the MBR.
"""
- bootimg_dir = cls._get_bootimg_dir(bootimg_dir, 'syslinux')
- mbrfile = "%s/syslinux/" % bootimg_dir
- if creator.ptable_format == 'msdos':
- mbrfile += "mbr.bin"
- elif creator.ptable_format == 'gpt':
- mbrfile += "gptmbr.bin"
- else:
- raise WicError("Unsupported partition table: %s" %
- creator.ptable_format)
-
- if not os.path.exists(mbrfile):
- raise WicError("Couldn't find %s. If using the -e option, do you "
- "have the right MACHINE set in local.conf? If not, "
- "is the bootimg_dir path correct?" % mbrfile)
full_path = creator._full_path(workdir, disk_name, "direct")
logger.debug("Installing MBR on disk %s as %s with size %s bytes",
disk_name, full_path, disk.min_size)
- dd_cmd = "dd if=%s of=%s conv=notrunc" % (mbrfile, full_path)
- exec_cmd(dd_cmd, native_sysroot)
+ if cls.loader == 'grub':
+ cls._do_install_grub(creator, kernel_dir,
+ native_sysroot, full_path)
+ elif cls.loader == 'syslinux':
+ cls._do_install_syslinux(creator, bootimg_dir,
+ native_sysroot, full_path)
+ else:
+ raise WicError("boot loader some how not specified check do_prepare_partition")
@classmethod
def do_configure_partition(cls, part, source_params, creator, cr_workdir,
@@ -123,56 +115,16 @@ class BootimgPcbiosPlugin(SourcePlugin):
"""
Called before do_prepare_partition(), creates syslinux config
"""
- hdddir = "%s/hdd/boot" % cr_workdir
-
- install_cmd = "install -d %s" % hdddir
- exec_cmd(install_cmd)
-
- bootloader = creator.ks.bootloader
-
- custom_cfg = None
- if bootloader.configfile:
- custom_cfg = get_custom_config(bootloader.configfile)
- if custom_cfg:
- # Use a custom configuration for grub
- syslinux_conf = custom_cfg
- logger.debug("Using custom configuration file %s "
- "for syslinux.cfg", bootloader.configfile)
- else:
- raise WicError("configfile is specified but failed to "
- "get it from %s." % bootloader.configfile)
- if not custom_cfg:
- # Create syslinux configuration using parameters from wks file
- splash = os.path.join(cr_workdir, "/hdd/boot/splash.jpg")
- if os.path.exists(splash):
- splashline = "menu background splash.jpg"
+ try:
+ if source_params['loader-bios'] == 'grub':
+ cls._do_configure_grub_cfg(creator, cr_workdir)
+ elif source_params['loader-bios'] == 'syslinux':
+ cls._do_configure_syslinux_cfg(creator, cr_workdir, bootimg_dir)
else:
- splashline = ""
-
- syslinux_conf = ""
- syslinux_conf += "PROMPT 0\n"
- syslinux_conf += "TIMEOUT " + str(bootloader.timeout) + "\n"
- syslinux_conf += "\n"
- syslinux_conf += "ALLOWOPTIONS 1\n"
- syslinux_conf += "SERIAL 0 115200\n"
- syslinux_conf += "\n"
- if splashline:
- syslinux_conf += "%s\n" % splashline
- syslinux_conf += "DEFAULT boot\n"
- syslinux_conf += "LABEL boot\n"
-
- kernel = "/" + get_bitbake_var("KERNEL_IMAGETYPE")
- syslinux_conf += "KERNEL " + kernel + "\n"
-
- syslinux_conf += "APPEND label=boot root=%s %s\n" % \
- (creator.rootdev, bootloader.append)
-
- logger.debug("Writing syslinux config %s/hdd/boot/syslinux.cfg",
- cr_workdir)
- cfg = open("%s/hdd/boot/syslinux.cfg" % cr_workdir, "w")
- cfg.write(syslinux_conf)
- cfg.close()
+ raise WicError("unrecognized bootimg_pcbios loader: %s" % source_params['loader-bios'])
+ except KeyError:
+ cls._do_configure_syslinux_cfg(creator, cr_workdir, bootimg_dir)
@classmethod
def do_prepare_partition(cls, part, source_params, creator, cr_workdir,
@@ -183,70 +135,22 @@ class BootimgPcbiosPlugin(SourcePlugin):
'prepares' the partition to be incorporated into the image.
In this case, prepare content for legacy bios boot partition.
"""
- bootimg_dir = cls._get_bootimg_dir(bootimg_dir, 'syslinux')
-
- staging_kernel_dir = kernel_dir
- hdddir = "%s/hdd/boot" % cr_workdir
-
- kernel = get_bitbake_var("KERNEL_IMAGETYPE")
- if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1":
- if get_bitbake_var("INITRAMFS_IMAGE"):
- kernel = "%s-%s.bin" % \
- (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME"))
-
- cmds = ("install -m 0644 %s/%s %s/%s" %
- (staging_kernel_dir, kernel, hdddir, get_bitbake_var("KERNEL_IMAGETYPE")),
- "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" %
- (bootimg_dir, hdddir),
- "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" %
- (bootimg_dir, hdddir),
- "install -m 444 %s/syslinux/libcom32.c32 %s/libcom32.c32" %
- (bootimg_dir, hdddir),
- "install -m 444 %s/syslinux/libutil.c32 %s/libutil.c32" %
- (bootimg_dir, hdddir))
-
- for install_cmd in cmds:
- exec_cmd(install_cmd)
-
- du_cmd = "du -bks %s" % hdddir
- out = exec_cmd(du_cmd)
- blocks = int(out.split()[0])
-
- extra_blocks = part.get_extra_block_count(blocks)
-
- if extra_blocks < BOOTDD_EXTRA_SPACE:
- extra_blocks = BOOTDD_EXTRA_SPACE
-
- blocks += extra_blocks
-
- logger.debug("Added %d extra blocks to %s to get to %d total blocks",
- extra_blocks, part.mountpoint, blocks)
-
- # dosfs image, created by mkdosfs
- bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno)
-
- 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)
- exec_native_cmd(mcopy_cmd, native_sysroot)
-
- syslinux_cmd = "syslinux %s" % bootimg
- exec_native_cmd(syslinux_cmd, native_sysroot)
-
- chmod_cmd = "chmod 644 %s" % bootimg
- exec_cmd(chmod_cmd)
-
- du_cmd = "du -Lbks %s" % bootimg
- out = exec_cmd(du_cmd)
- bootimg_size = out.split()[0]
+ try:
+ if source_params['loader-bios'] == 'grub':
+ cls._do_prepare_grub(part, cr_workdir, oe_builddir,
+ kernel_dir, rootfs_dir, native_sysroot)
+ elif source_params['loader-bios'] == 'syslinux':
+ cls._do_prepare_syslinux(part, cr_workdir, oe_builddir,
+ bootimg_dir, kernel_dir, native_sysroot)
+ else:
+ raise WicError("unrecognized bootimg_pcbios loader: %s" % source_params['loader-bios'])
- part.size = int(bootimg_size)
- part.source_file = bootimg
+ # Required by do_install_disk
+ cls.loader = source_params['loader-bios']
+ except KeyError:
+ # Required by do_install_disk
+ cls.loader = 'syslinux'
@classmethod
def _get_staging_libdir(cls):
Due to the bootimg_biosplusefi source_params['loader'] had to be named source_params['loader-bios'] so not to create conflict in the wics plugin Removes old syslinux implementation as it was copied into seperate functions and adds ability to set and or not set source_params. If source_params set check for both * syslinux * grub if not set default to using syslinux Signed-off-by: Vincent Davis Jr <vince@underview.tech> --- .../lib/wic/plugins/source/bootimg_pcbios.py | 156 ++++-------------- 1 file changed, 30 insertions(+), 126 deletions(-)