[OE-core] [PATCH 2/2] wic: clone gummiboot wks for systemd-boot

[Jianxun Zhang]

> On Jul 11, 2016, at 10:37 AM, Khem Raj <raj.khem at gmail.com> wrote:
> 
> On Mon, Jul 11, 2016 at 10:03 AM, Jianxun Zhang
> <jianxun.zhang at linux.intel.com> wrote:
>> 
>>> On Jul 8, 2016, at 1:58 PM, Khem Raj <raj.khem at gmail.com> wrote:
>>> 
>>> On Fri, Jul 8, 2016 at 10:44 AM, 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 mksystemd-bootdisk -e core-image-minimal
>>> 
>>> prefixing wks file with mk is that a nomenclature. if no then lets avoid it
>> Khem,
>> I thought following gummiboot wks naming is a safe call. :-)
>> I can change it to any new name suggested, just want to avoid any ambiguity for a V2:
>> Do you and others think “systemd-bootdisk” is a good name for new wks?
>> 
> 
> yes looks better
> 
I have submitted V2 several days ago to address Khem’s suggestion to rename mksystemd-bootdisk.wks to systemd-boot.wks.

But today I found  this V1 has been merged in OE master (4c9b1a4). I am not sure if it means maintainers made decision to prefer V1.

You could see both wks files for same thing once V2 gets merged too.

Worrying about a duplicate merge for V2, I will notice people in V2 thread. 

Thanks



> 
>> Thanks
>>> 
>>>> 
>>>> 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>
>>>> ---
>>>> scripts/lib/wic/canned-wks/mksystemd-bootdisk.wks | 11 +++++++++++
>>>> 1 file changed, 11 insertions(+)
>>>> create mode 100644 scripts/lib/wic/canned-wks/mksystemd-bootdisk.wks
>>>> 
>>>> diff --git a/scripts/lib/wic/canned-wks/mksystemd-bootdisk.wks b/scripts/lib/wic/canned-wks/mksystemd-bootdisk.wks
>>>> new file mode 100644
>>>> index 0000000..df706e8
>>>> --- /dev/null
>>>> +++ b/scripts/lib/wic/canned-wks/mksystemd-bootdisk.wks
>>>> @@ -0,0 +1,11 @@
>>>> +# short-description: Create an EFI disk image
>>>> +# long-description: Creates a partitioned EFI disk image that the user
>>>> +# can directly dd to boot media.
>>>> +
>>>> +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
>>>> 
>>>> --
>>>> _______________________________________________
>>>> Openembedded-core mailing list
>>>> Openembedded-core at lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core