[OE-core] DO NOT MERGE [PATCHv2 2/2]: wic: clone gummiboot wks for systemd-boot

Jianxun Zhang jianxun.zhang at linux.intel.com
Mon Jul 25 18:47:31 UTC 2016


I just found V1 of this patch has been merged. I will rebase this V2 and re-submit it.

Thanks


> On Jul 19, 2016, at 12:04 PM, Jianxun Zhang <jianxun.zhang at linux.intel.com> wrote:
> 
> This wks is just a copy of gummiboot wks with bootloader
> changed to systemd-boot. A very basic boot test on a X86
> target is done with a direct-boot image generated by:
> 
> wic create systemd-bootdisk -e core-image-minimal
> 
> Because we plan to replace gummiboot with systemd-boot at any
> time in the future, we summarize history (as much as I can) of
> the current gummiboot wks before it's gone:
> 
> -----------------------------------------------------------------
> commit 7d4bb40905fab38fb3db1d0e17afbc803622f00c
> Author: Ed Bartosh <ed.bartosh at linux.intel.com>
> Date:   Wed Sep 2 13:58:02 2015 +0300
> 
>    wic: get rid of scripts/lib/image
> 
>    Moved content of scripts/lib/image/ to scripts/lib/wic as
>    one directory with the same name as a tool is self-explanatory
>    and less confusing than two.
> 
>    (From OE-Core rev: 5dc02d572794298b3362378cea3d7da654456c44)
> 
>    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
>    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> commit 77561e719181d58289687373eebadce764f838a7
> Author: Ed Bartosh <ed.bartosh at linux.intel.com>
> Date:   Wed Sep 2 13:58:01 2015 +0300
> 
>    wic: use ext4 in canned .wks files
> 
>    Latest kernel doesn't have ext3 compiled in. Wic images produced
>    from canned .wks can't boot because of that. Switching to ext4
>    fixes this issue.
> 
>    (From OE-Core rev: d281a65a81f369fc8d75023b8f911ce4106969c1)
> 
>    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
>    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> commit 072657ce98414afdd6f68941847e21fc5ce496c7
> Author: Tom Zanussi <tom.zanussi at linux.intel.com>
> Date:   Mon Aug 11 20:35:41 2014 -0500
> 
>    wic: Add mkgummidisk kickstart file
> 
>    This is the same as mkefidisk but uses gummiboot instead of grub-efi.
> 
>    (From OE-Core rev: 5979409ebfab0bb07b3c2b2fcf14a722c441f07b)
> 
>    Signed-off-by: Tom Zanussi <tom.zanussi at linux.intel.com>
>    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> -----------------------------------------------------------------
> 
> Signed-off-by: Jianxun Zhang <jianxun.zhang at linux.intel.com>
> ---
> Just get a hand on this work. V2 addresses name of new wks from
> V1 review.
> 
> scripts/lib/wic/canned-wks/systemd-bootdisk.wks | 11 +++++++++++
> 1 file changed, 11 insertions(+)
> create mode 100644 scripts/lib/wic/canned-wks/systemd-bootdisk.wks
> 
> diff --git a/scripts/lib/wic/canned-wks/systemd-bootdisk.wks b/scripts/lib/wic/canned-wks/systemd-bootdisk.wks
> new file mode 100644
> index 0000000..d80189b
> --- /dev/null
> +++ b/scripts/lib/wic/canned-wks/systemd-bootdisk.wks
> @@ -0,0 +1,11 @@
> +# short-description: Create an EFI disk image with systemd-boot
> +# long-description: Creates a partitioned EFI disk image that the user
> +# can directly dd to boot media. The selected bootloader is systemd-boot.
> +
> +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024
> +
> +part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024
> +
> +part swap --ondisk sda --size 44 --label swap1 --fstype=swap
> +
> +bootloader  --timeout=10  --append="rootwait rootfstype=ext4 console=ttyPCH0,115200 console=tty0 vmalloc=256MB snd-hda-intel.enable_msi=0"
> -- 
> 2.7.4
> 




More information about the Openembedded-core mailing list