wic/bootimg-efi: allow multiple initrd
PATCH 1/1 wic/bootimg-efi: allow multiple initrd
From: Chee Yang Lee <[email protected]>
Allow plugin bootimg-efi to configure with multiple initrd through source parameter.
Uses ; to separate each initrd.
e.g:
--sourceparams="loader=${EFI_PROVIDER},initrd=initrd1;initrd2"
--- scripts/lib/wic/plugins/source/bootimg-efi.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
scripts/lib/wic/plugins/source/bootimg-efi.py +16 -8
@@ -55,8 +55,10 @@ class BootimgEFIPlugin(SourcePlugin): if not bootimg_dir: raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") - cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir) - exec_cmd(cp_cmd, True) + 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")
@@ -83,8 +85,11 @@ class BootimgEFIPlugin(SourcePlugin): grubefi_conf += "linux /%s %s rootwait %s\n" \ % (kernel, label_conf, bootloader.append) - if initrd: - grubefi_conf += "initrd /%s\n" % initrd + if initrds: + grubefi_conf += "initrd" + for rd in initrds: + grubefi_conf += " /%s" % rd + grubefi_conf += "\n" grubefi_conf += "}\n"
@@ -119,8 +124,10 @@ class BootimgEFIPlugin(SourcePlugin): if not bootimg_dir: raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") - cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir) - exec_cmd(cp_cmd, True) + 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")
@@ -163,8 +170,9 @@ class BootimgEFIPlugin(SourcePlugin): boot_conf += "options %s %s\n" % \ (label_conf, bootloader.append) - if initrd: - boot_conf += "initrd /%s\n" % initrd + if initrds: + for rd in initrds: + boot_conf += "initrd /%s\n" % rd logger.debug("Writing systemd-boot config " "%s/hdd/boot/loader/entries/boot.conf", cr_workdir)
Signature · 1 line
2.7.4
Quoted 7 lines · On Thu, 2019-06-13 at 14:21 +0800, [email protected] wrote:
From: Chee Yang Lee <[email protected]>
Allow plugin bootimg-efi to configure with multiple initrd through source parameter.
Uses ; to separate each initrd.
Quoted 8 lines
e.g:
--sourceparams="loader=${EFI_PROVIDER},initrd=initrd1;initrd2"Signed-off-by Chee Yang Lee <[email protected]>--- scripts/lib/wic/plugins/source/bootimg-efi.py | 24 ++++++++++++++++- ------- 1 file changed, 16 insertions(+), 8 deletions(-)
How was this tested? It broke the autobuilder build:
| DEBUG: Python function extend_recipe_sysroot finished | DEBUG: Executing shell function do_image_wic | INFO: Creating image(s)... | | Traceback (most recent call last): | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/wic", line 525, in <module> | sys.exit(main(sys.argv[1:])) | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/wic", line 520, in main | return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands) | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/help.py", line 83, in invoke_subcommand | subcmd[0](args, usage) | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/wic", line 220, in wic_create_subcommand | native_sysroot, options) | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/engine.py", line 189, in wic_create | plugin.do_create() | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/imager/direct.py", line 86, in do_create | self.create() | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/imager/direct.py", line 196, in create | self._image.prepare(self) | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/imager/direct.py", line 362, in prepare | imager.kernel_dir, imager.native_sysroot) | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/partition.py", line 167, in prepare | kernel_dir, native_sysroot) | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/source/bootimg-efi.py", line 198, in do_configure_partition | cls.do_configure_grubefi(hdddir, creator, cr_workdir, source_params) | File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/source/bootimg-efi.py", line 88, in do_configure_grubefi | if initrds: | UnboundLocalError: local variable 'initrds' referenced before assignment | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_image_wic (log file is located at /home/pokybuild/yocto-worker/genericx86/build/build/tmp/work/genericx86-poky-linux/core-image-minimal-initramfs/1.0-r0/temp/log.do_image_wic.23700)
https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/712
https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/717
https://autobuilder.yoctoproject.org/typhoon/#/builders/43/builds/712
https://autobuilder.yoctoproject.org/typhoon/#/builders/49/builds/711
https://autobuilder.yoctoproject.org/typhoon/#/builders/58/builds/699
wic selftests don't even work:
https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/526
Richard
My bad, I should test it with complete oe-selftest wic module.
On 6/18/19, 4:37 AM, "Richard Purdie" <[email protected]> wrote:
On Thu, 2019-06-13 at 14:21 +0800, [email protected] wrote:
> From: Chee Yang Lee <[email protected]>
>
> Allow plugin bootimg-efi to configure with multiple initrd > through source parameter.
>
> Uses ; to separate each initrd.
>
> e.g:
> --sourceparams="loader=${EFI_PROVIDER},initrd=initrd1;initrd2" >
> Signed-off-by: Chee Yang Lee <[email protected]>
> ---
> scripts/lib/wic/plugins/source/bootimg-efi.py | 24 ++++++++++++++++- > -------
> 1 file changed, 16 insertions(+), 8 deletions(-)
How was this tested? It broke the autobuilder build:
| DEBUG: Python function extend_recipe_sysroot finished
| DEBUG: Executing shell function do_image_wic
| INFO: Creating image(s)...
|
| Traceback (most recent call last):
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/wic", line 525, in <module>
| sys.exit(main(sys.argv[1:]))
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/wic", line 520, in main
| return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands)
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/help.py", line 83, in invoke_subcommand
| subcmd[0](args, usage)
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/wic", line 220, in wic_create_subcommand
| native_sysroot, options)
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/engine.py", line 189, in wic_create
| plugin.do_create()
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/imager/direct.py", line 86, in do_create
| self.create()
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/imager/direct.py", line 196, in create
| self._image.prepare(self)
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/imager/direct.py", line 362, in prepare
| imager.kernel_dir, imager.native_sysroot)
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/partition.py", line 167, in prepare
| kernel_dir, native_sysroot)
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/source/bootimg-efi.py", line 198, in do_configure_partition
| cls.do_configure_grubefi(hdddir, creator, cr_workdir, source_params)
| File "/home/pokybuild/yocto-worker/genericx86/build/scripts/lib/wic/plugins/source/bootimg-efi.py", line 88, in do_configure_grubefi
| if initrds:
| UnboundLocalError: local variable 'initrds' referenced before assignment
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_image_wic (log file is located at /home/pokybuild/yocto-worker/genericx86/build/build/tmp/work/genericx86-poky-linux/core-image-minimal-initramfs/1.0-r0/temp/log.do_image_wic.23700)
https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/712
https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/717
https://autobuilder.yoctoproject.org/typhoon/#/builders/43/builds/712
https://autobuilder.yoctoproject.org/typhoon/#/builders/49/builds/711
https://autobuilder.yoctoproject.org/typhoon/#/builders/58/builds/699
wic selftests don't even work:
https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/526
Richard