MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wic/bootimg-efi: Factor out some common bits

Browse Source 
The paths for configuring grub and systemd-boot have some common bits
around copying the initrd files. This will even grow when adding dtb
support. Factor this out into a class function.

Along this, avoid evaluating 'create-unified-kernel-image' multiple
times in do_configure_systemdboot and suppress a bogus warning about
"Ignoring missing initrd" when it is turned on.

(From OE-Core rev: c700cfd88473b9ed4e12a6620fb089f41bd95a9e)

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jan Kiszka 2022-07-30 10:24:04 +02:00 committed by Richard Purdie
parent 44cc49c679
commit be0ca8e685
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/lib/wic/plugins/source/bootimg-efi.py
View File

@ -34,6 +34,20 @@ class BootimgEFIPlugin(SourcePlugin):
name = 'bootimg-efi' name = 'bootimg-efi'
@classmethod
def _copy_additional_files(cls, hdddir, initrd):
if initrd:
bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
if not bootimg_dir:
raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")
initrds = initrd.split(';')
for rd in initrds:
cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir)
exec_cmd(cp_cmd, True)
else:
logger.debug("Ignoring missing initrd")
@classmethod @classmethod
def do_configure_grubefi(cls, hdddir, creator, cr_workdir, source_params): def do_configure_grubefi(cls, hdddir, creator, cr_workdir, source_params):
""" """
@ -54,17 +68,7 @@ class BootimgEFIPlugin(SourcePlugin):
initrd = source_params.get('initrd') initrd = source_params.get('initrd')
if initrd: cls._copy_additional_files(hdddir, initrd)
bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
if not bootimg_dir:
raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")
initrds = initrd.split(';')
for rd in initrds:
cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir)
exec_cmd(cp_cmd, True)
else:
logger.debug("Ignoring missing initrd")
if not custom_cfg: if not custom_cfg:
# Create grub configuration using parameters from wks file # Create grub configuration using parameters from wks file
@ -119,25 +123,17 @@ class BootimgEFIPlugin(SourcePlugin):
bootloader = creator.ks.bootloader bootloader = creator.ks.bootloader
unified_image = source_params.get('create-unified-kernel-image') == "true"
loader_conf = "" loader_conf = ""
if source_params.get('create-unified-kernel-image') != "true": if not unified_image:
loader_conf += "default boot\n" loader_conf += "default boot\n"
loader_conf += "timeout %d\n" % bootloader.timeout loader_conf += "timeout %d\n" % bootloader.timeout
initrd = source_params.get('initrd') initrd = source_params.get('initrd')
if initrd and source_params.get('create-unified-kernel-image') != "true": if not unified_image:
# obviously we need to have a common common deploy var cls._copy_additional_files(hdddir, initrd)
bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
if not bootimg_dir:
raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")
initrds = initrd.split(';')
for rd in initrds:
cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir)
exec_cmd(cp_cmd, True)
else:
logger.debug("Ignoring missing initrd")
logger.debug("Writing systemd-boot config " logger.debug("Writing systemd-boot config "
"%s/hdd/boot/loader/loader.conf", cr_workdir) "%s/hdd/boot/loader/loader.conf", cr_workdir)
@ -185,7 +181,7 @@ class BootimgEFIPlugin(SourcePlugin):
for rd in initrds: for rd in initrds:
boot_conf += "initrd /%s\n" % rd boot_conf += "initrd /%s\n" % rd
if source_params.get('create-unified-kernel-image') != "true": if not unified_image:
logger.debug("Writing systemd-boot config " logger.debug("Writing systemd-boot config "
"%s/hdd/boot/loader/entries/boot.conf", cr_workdir) "%s/hdd/boot/loader/entries/boot.conf", cr_workdir)
cfg = open("%s/hdd/boot/loader/entries/boot.conf" % cr_workdir, "w") cfg = open("%s/hdd/boot/loader/entries/boot.conf" % cr_workdir, "w")