[OE-core] [PATCH] wic/bootimg-efi: allow multiple initrd

[Lee, Chee Yang]

My bad, I should test it with complete oe-selftest wic module.

On 6/18/19, 4:37 AM, "Richard Purdie" <richard.purdie at linuxfoundation.org> wrote:

    On Thu, 2019-06-13 at 14:21 +0800, chee.yang.lee at intel.com wrote:
    > From: Chee Yang Lee <chee.yang.lee at intel.com>
    > 
    > 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 <chee.yang.lee at intel.com>
    > ---
    >  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