* [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot
@ 2025-08-01 2:16 Vincent Davis Jr
2025-08-01 2:16 ` [PATCH v5 2/3] bootimg_pcbios: final import of grub legacy boot Vincent Davis Jr
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Vincent Davis Jr @ 2025-08-01 2:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Vincent Davis Jr
Moves syslinux config file creation,
partition prepare, and mbr install
tasks into there own seperate functions
before removal from SourcePlugin class
functions.
Add 3 new functions for creation of
grub config, preparing boot partition
to contain grub config and modules,
and install grub boot.img to resulting
wic image.
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
---
.../lib/wic/plugins/source/bootimg_pcbios.py | 345 +++++++++++++++++-
1 file changed, 344 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/wic/plugins/source/bootimg_pcbios.py b/scripts/lib/wic/plugins/source/bootimg_pcbios.py
index 21f41e00bb..f74075ed79 100644
--- a/scripts/lib/wic/plugins/source/bootimg_pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg_pcbios.py
@@ -13,7 +13,9 @@
import logging
import os
import re
+import shutil
+from glob import glob
from wic import WicError
from wic.engine import get_custom_config
from wic.pluginbase import SourcePlugin
@@ -24,11 +26,49 @@ logger = logging.getLogger('wic')
class BootimgPcbiosPlugin(SourcePlugin):
"""
- Create MBR boot partition and install syslinux on it.
+ Creates boot partition bootable off of legacy BIOS firmare with
+ MBR/MSDOS as partition table format. Plugin will install caller
+ selected bootloader directly to resulting wic image.
+
+ Supported Bootloaders:
+ * syslinux
+ * grub
+
+ ****************** Wic Plugin Depends/Vars ******************
+ WKS_FILE_DEPENDS = "grub-native grub"
+ WKS_FILE_DEPENDS = "syslinux-native syslinux"
+
+ # Optional variables
+ GRUB_PREFIX_PATH = '/boot/grub2' # Default: /boot/grub
+ GRUB_MKIMAGE_FORMAT_PC = 'i386-pc' # Default: i386-pc
+
+ WICVARS:append = "\
+ GRUB_PREFIX_PATH \
+ GRUB_MKIMAGE_FORMAT_PC \
+ "
+ ****************** Wic Plugin Depends/Vars ******************
+
+ **************** Example kickstart Legacy Bios Grub Boot ****************
+ part boot --label bios_boot --fstype ext4 --offset 1024 --fixed-size 78M
+ --source bootimg_pcbios --sourceparams="loader-bios=grub" --active
+
+ part roots --label rootfs --fstype ext4 --source rootfs --use-uuid
+ bootloader --ptable msdos --source bootimg_pcbios
+ **************** Example kickstart Legacy Bios Grub Boot ****************
+
+ *************** Example kickstart Legacy Bios Syslinux Boot ****************
+ part /boot --source bootimg_pcbios --sourceparams="loader-bios=syslinux"
+ --ondisk sda --label boot --active --align 1024
+
+ part roots --label rootfs --fstype ext4 --source rootfs --use-uuid
+ bootloader --ptable msdos --source bootimg_pcbios
"""
name = 'bootimg_pcbios'
+ # Variable required for do_install_disk
+ loader = ''
+
@classmethod
def _get_bootimg_dir(cls, bootimg_dir, dirname):
"""
@@ -207,3 +247,306 @@ class BootimgPcbiosPlugin(SourcePlugin):
part.size = int(bootimg_size)
part.source_file = bootimg
+
+ @classmethod
+ def _get_staging_libdir(cls):
+ """
+ For unknown reasons when running test with poky
+ STAGING_LIBDIR gets unset when wic create is executed.
+ Bellow is a hack to determine what STAGING_LIBDIR should
+ be if not specified.
+ """
+
+ staging_libdir = get_bitbake_var('STAGING_LIBDIR')
+ staging_dir_target = get_bitbake_var('STAGING_DIR_TARGET')
+
+ if not staging_libdir:
+ staging_libdir = '%s/usr/lib64' % staging_dir_target
+ if not os.path.isdir(staging_libdir):
+ staging_libdir = '%s/usr/lib32' % staging_dir_target
+ if not os.path.isdir(staging_libdir):
+ staging_libdir = '%s/usr/lib' % staging_dir_target
+
+ return staging_libdir
+
+ @classmethod
+ def _get_bootloader_config(cls, bootloader, loader):
+ custom_cfg = None
+
+ if bootloader.configfile:
+ custom_cfg = get_custom_config(bootloader.configfile)
+ if custom_cfg:
+ logger.debug("Using custom configuration file %s "
+ "for %s.cfg", bootloader.configfile,
+ loader)
+ return custom_cfg
+ else:
+ raise WicError("configfile is specified but failed to "
+ "get it from %s." % bootloader.configfile)
+ return custom_cfg
+
+ @classmethod
+ def _do_configure_syslinux_cfg(cls, creator, cr_workdir, bootimg_dir):
+ hdddir = "%s/hdd/boot" % cr_workdir
+ bootloader = creator.ks.bootloader
+
+ syslinux_conf = cls._get_bootloader_config(bootloader, 'syslinux')
+
+ install_cmd = "install -d %s" % hdddir
+ exec_cmd(install_cmd)
+
+ if not syslinux_conf:
+ # Create syslinux configuration using parameters from wks file
+ splash = os.path.join(hdddir, "/splash.jpg")
+ if os.path.exists(splash):
+ splashline = "menu background splash.jpg"
+ 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/syslinux.cfg", hdddir)
+ cfg = open("%s/syslinux.cfg" % hdddir, "w")
+ cfg.write(syslinux_conf)
+ cfg.close()
+
+ @classmethod
+ def _do_prepare_syslinux(cls, part, cr_workdir, oe_builddir,
+ bootimg_dir, kernel_dir, native_sysroot):
+
+ 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]
+
+ part.size = int(bootimg_size)
+ part.source_file = bootimg
+
+ @classmethod
+ def _do_install_syslinux(cls, creator, bootimg_dir,
+ native_sysroot, full_path):
+
+ 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)
+
+ dd_cmd = "dd if=%s of=%s conv=notrunc" % (mbrfile, full_path)
+ exec_cmd(dd_cmd, native_sysroot)
+
+ @classmethod
+ def _do_configure_grub_cfg(cls, creator, cr_workdir):
+ hdddir = "%s/hdd" % cr_workdir
+ bootloader = creator.ks.bootloader
+
+ grub_conf = cls._get_bootloader_config(bootloader, 'grub')
+
+ grub_prefix_path = get_bitbake_var('GRUB_PREFIX_PATH')
+ if not grub_prefix_path:
+ grub_prefix_path = '/boot/grub'
+
+ grub_path = "%s/%s" %(hdddir, grub_prefix_path)
+ install_cmd = "install -d %s" % grub_path
+ exec_cmd(install_cmd)
+
+ if not grub_conf:
+ grub_conf = 'serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n'
+ grub_conf += 'set gfxmode=auto\n'
+ grub_conf += 'set gfxpayload=keep\n\n'
+ grub_conf += 'set default=0\n\n'
+ grub_conf += '# Boot automatically after 500 secs.\n'
+ grub_conf += 'set timeout=500\n\n'
+ grub_conf += 'menuentry \'rootfs\' {\n'
+ grub_conf += '\tsearch --no-floppy --set=root --label rootfs\n'
+ grub_conf += '\tprobe --set partuuid --part-uuid ($root)\n'
+
+ kernel = "/boot/" + get_bitbake_var("KERNEL_IMAGETYPE")
+ grub_conf += '\tlinux %s root=PARTUUID=$partuuid %s\n}\n' % \
+ (kernel, bootloader.append if bootloader.append else '')
+
+ logger.debug("Writing grub config %s/grub.cfg", grub_path)
+ cfg = open("%s/grub.cfg" % grub_path, "w")
+ cfg.write(grub_conf)
+ cfg.close()
+
+ @classmethod
+ def _do_prepare_grub(cls, part, cr_workdir, oe_builddir,
+ kernel_dir, rootfs_dir, native_sysroot):
+ """
+ 1. Generate embed.cfg that'll later be embedded into core.img.
+ So, that core.img knows where to search for grub.cfg.
+ 2. Generate core.img or grub stage 1.5.
+ 3. Copy modules into partition.
+ 4. Create partition rootfs file.
+ """
+
+ hdddir = "%s/hdd" % cr_workdir
+
+ copy_types = [ '*.mod', '*.o', '*.lst' ]
+
+ builtin_modules = 'boot linux ext2 fat serial part_msdos part_gpt \
+ normal multiboot probe biosdisk msdospart configfile search loadenv test'
+
+ staging_libdir = cls._get_staging_libdir()
+
+ grub_format = get_bitbake_var('GRUB_MKIMAGE_FORMAT_PC')
+ if not grub_format:
+ grub_format = 'i386-pc'
+
+ grub_prefix_path = get_bitbake_var('GRUB_PREFIX_PATH')
+ if not grub_prefix_path:
+ grub_prefix_path = '/boot/grub'
+
+ grub_path = "%s/%s" %(hdddir, grub_prefix_path)
+ core_img = '%s/grub-bios-core.img' % (kernel_dir)
+ grub_mods_path = '%s/grub/%s' % (staging_libdir, grub_format)
+
+ # Generate embedded grub config
+ embed_cfg_str = 'search.file %s/grub.cfg root\n' % (grub_prefix_path)
+ embed_cfg_str += 'set prefix=($root)%s\n' % (grub_prefix_path)
+ embed_cfg_str += 'configfile ($root)%s/grub.cfg\n' % (grub_prefix_path)
+ cfg = open('%s/embed.cfg' % (kernel_dir), 'w+')
+ cfg.write(embed_cfg_str)
+ cfg.close()
+
+ # core.img doesn't get included into boot partition
+ # it's later dd onto the resulting wic image.
+ grub_mkimage = 'grub-mkimage \
+ --prefix=%s \
+ --format=%s \
+ --config=%s/embed.cfg \
+ --directory=%s \
+ --output=%s %s' % \
+ (grub_prefix_path, grub_format, kernel_dir,
+ grub_mods_path, core_img, builtin_modules)
+ exec_native_cmd(grub_mkimage, native_sysroot)
+
+ # Copy grub modules
+ install_dir = '%s/%s/%s' % (hdddir, grub_prefix_path, grub_format)
+ os.makedirs(install_dir, exist_ok=True)
+
+ for ctype in copy_types:
+ files = glob('%s/grub/%s/%s' % \
+ (staging_libdir, grub_format, ctype))
+ for file in files:
+ shutil.copy2(file, install_dir, follow_symlinks=True)
+
+ # Create boot partition
+ logger.debug('Prepare partition using rootfs in %s', hdddir)
+ part.prepare_rootfs(cr_workdir, oe_builddir, hdddir,
+ native_sysroot, False)
+
+ @classmethod
+ def _do_install_grub(cls, creator, kernel_dir,
+ native_sysroot, full_path):
+ core_img = '%s/grub-bios-core.img' % (kernel_dir)
+
+ staging_libdir = cls._get_staging_libdir()
+
+ grub_format = get_bitbake_var('GRUB_MKIMAGE_FORMAT_PC')
+ if not grub_format:
+ grub_format = 'i386-pc'
+
+ boot_img = '%s/grub/%s/boot.img' %(staging_libdir, grub_format)
+ if not os.path.exists(boot_img):
+ raise WicError("Couldn't find %s. Did you include "
+ "do_image_wic[depends] += \"grub:do_populate_sysroot\" "
+ "in your image recipe" % boot_img)
+
+ # Install boot.img or grub stage 1
+ dd_cmd = "dd if=%s of=%s conv=notrunc bs=1 seek=0 count=440" % (boot_img, full_path)
+ exec_cmd(dd_cmd, native_sysroot)
+
+ if creator.ptable_format == 'msdos':
+ # Install core.img or grub stage 1.5
+ dd_cmd = "dd if=%s of=%s conv=notrunc bs=1 seek=512" % (core_img, full_path)
+ exec_cmd(dd_cmd, native_sysroot)
+ elif creator.ptable_format == 'gpt':
+ logger.debug('Update core.img stored on bios boot partition')
+ else:
+ raise WicError("Unsupported partition table: %s" %
+ creator.ptable_format)
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v5 2/3] bootimg_pcbios: final import of grub legacy boot
2025-08-01 2:16 [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot Vincent Davis Jr
@ 2025-08-01 2:16 ` Vincent Davis Jr
2025-08-01 2:16 ` [PATCH v5 3/3] oe-selftest: add wic.Wic.test_grub_install_pcbios Vincent Davis Jr
2025-08-01 9:56 ` [OE-core] [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot Mathieu Dubois-Briand
2 siblings, 0 replies; 4+ messages in thread
From: Vincent Davis Jr @ 2025-08-01 2:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Vincent Davis Jr
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(-)
diff --git a/scripts/lib/wic/plugins/source/bootimg_pcbios.py b/scripts/lib/wic/plugins/source/bootimg_pcbios.py
index f74075ed79..3c403f4ec2 100644
--- a/scripts/lib/wic/plugins/source/bootimg_pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg_pcbios.py
@@ -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):
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v5 3/3] oe-selftest: add wic.Wic.test_grub_install_pcbios
2025-08-01 2:16 [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot Vincent Davis Jr
2025-08-01 2:16 ` [PATCH v5 2/3] bootimg_pcbios: final import of grub legacy boot Vincent Davis Jr
@ 2025-08-01 2:16 ` Vincent Davis Jr
2025-08-01 9:56 ` [OE-core] [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot Mathieu Dubois-Briand
2 siblings, 0 replies; 4+ messages in thread
From: Vincent Davis Jr @ 2025-08-01 2:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Vincent Davis Jr
wic.Wic.test_grub_install_pcbios test
Test updates to the bootimg_pcbios plugin that
enables support for installing grub directly
to the resulting wic image.
The test checks to see if the wics plugin
generates a wic image. Then see's if normal.mod
and grub.cfg are located in the boot partition.
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
---
meta/lib/oeqa/selftest/cases/wic.py | 41 +++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index 680f99d381..44442e402d 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -215,6 +215,47 @@ class Wic(WicTestCase):
found, "The kernel image '{}' was not found in the boot partition".format(kimgtype)
)
+ @skipIfNotArch(['x86_64'])
+ def test_grub_install_pcbios(self):
+ """
+ Test the installation of the grub modules + config
+ into the boot directory in the resulting wic image.
+ """
+
+ # create a temporary file for the WKS content
+ with NamedTemporaryFile("w", suffix=".wks") as wks:
+ wks.write(
+ 'part --source bootimg_pcbios --sourceparams="loader-bios=grub" '
+ '--offset 1024 --fixed-size 78M --label boot --active\n'
+ 'bootloader --ptable msdos --source bootimg_pcbios\n'
+ )
+ wks.flush()
+ # create a temporary directory to extract the disk image to
+ with TemporaryDirectory() as tmpdir:
+ img = "core-image-minimal"
+ config = 'DEPENDS:pn-%s += "grub-native grub"' % (img)
+
+ self.append_config(config)
+ bitbake(img)
+ self.remove_config(config)
+
+ cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir)
+ runCmd(cmd)
+
+ wksname = os.path.splitext(os.path.basename(wks.name))[0]
+ out = glob(os.path.join(self.resultdir, "%s-*.direct" % wksname))
+ self.assertEqual(1, len(out))
+
+ sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
+
+ # Check if grub.cfg is installed
+ result = runCmd("wic ls %s:1/boot/grub -n %s" % (out[0], sysroot))
+ self.assertIn('grub', result.output)
+
+ # Check if normal.mod is installed
+ result = runCmd("wic ls %s:1/boot/grub/i386-pc -n %s" % (out[0], sysroot))
+ self.assertIn('normal', result.output)
+
def test_build_image_name(self):
"""Test wic create wictestdisk --image-name=core-image-minimal"""
cmd = "wic create wictestdisk --image-name=core-image-minimal -o %s" % self.resultdir
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot
2025-08-01 2:16 [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot Vincent Davis Jr
2025-08-01 2:16 ` [PATCH v5 2/3] bootimg_pcbios: final import of grub legacy boot Vincent Davis Jr
2025-08-01 2:16 ` [PATCH v5 3/3] oe-selftest: add wic.Wic.test_grub_install_pcbios Vincent Davis Jr
@ 2025-08-01 9:56 ` Mathieu Dubois-Briand
2 siblings, 0 replies; 4+ messages in thread
From: Mathieu Dubois-Briand @ 2025-08-01 9:56 UTC (permalink / raw)
To: Vincent Davis Jr, openembedded-core
On Fri Aug 1, 2025 at 4:16 AM CEST, Vincent Davis Jr wrote:
> Moves syslinux config file creation,
> partition prepare, and mbr install
> tasks into there own seperate functions
> before removal from SourcePlugin class
> functions.
>
> Add 3 new functions for creation of
> grub config, preparing boot partition
> to contain grub config and modules,
> and install grub boot.img to resulting
> wic image.
>
> Signed-off-by: Vincent Davis Jr <vince@underview.tech>
> ---
Hi Vincent,
It looks like this is breaking some tests:
ERROR: core-image-minimal-dev-1.0-r0 do_image_wic: Execution of '/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal-dev/1.0/temp/run.do_image_wic.2578330' failed with exit code 1
...
| output: Error: Can't have the end before the start! (start sector=2048 length=0)
https://autobuilder.yoctoproject.org/valkyrie/#/builders/30/builds/2118
https://autobuilder.yoctoproject.org/valkyrie/#/builders/78/builds/2172
Can you have a look at these failures please?
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-08-01 9:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-01 2:16 [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot Vincent Davis Jr
2025-08-01 2:16 ` [PATCH v5 2/3] bootimg_pcbios: final import of grub legacy boot Vincent Davis Jr
2025-08-01 2:16 ` [PATCH v5 3/3] oe-selftest: add wic.Wic.test_grub_install_pcbios Vincent Davis Jr
2025-08-01 9:56 ` [OE-core] [PATCH v5 1/3] bootimg_pcbios: initial import of grub legacy bios boot Mathieu Dubois-Briand
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.