| Message ID | 20231115170039.486447-1-ross.burton@arm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | genericx86*: use common mkefidisk.wks.in | expand |
This depends on "[OE-core] [PATCH] canned-wks/mkefidisk.wks: generalise wic image”. Testing by someone who actually has an x86 board and uses genericx86-64 would be much appreciated. It should just boot as usual. Cheers, Ross > On 15 Nov 2023, at 17:00, Ross Burton via lists.yoctoproject.org <ross.burton=arm.com@lists.yoctoproject.org> wrote: > > From: Ross Burton <ross.burton@arm.com> > > There's no real need to use a genericx86*-specific wic file, use the > common mkefidisk.wks.in instead. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 +--- > meta-yocto-bsp/wic/genericx86.wks.in | 7 ------- > 2 files changed, 1 insertion(+), 10 deletions(-) > delete mode 100644 meta-yocto-bsp/wic/genericx86.wks.in > > diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > index e3badebf86d..e0cb7157135 100644 > --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > @@ -21,7 +21,5 @@ GLIBC_ADDONS = "nptl" > EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" > > IMAGE_FSTYPES += "wic wic.bmap" > -WKS_FILE ?= "genericx86.wks.in" > +WKS_FILE ?= "mkefidisk.wks.in" > EFI_PROVIDER ??= "grub-efi" > -do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" > -do_image_wic[recrdeptask] += "do_bootimg" > diff --git a/meta-yocto-bsp/wic/genericx86.wks.in b/meta-yocto-bsp/wic/genericx86.wks.in > deleted file mode 100644 > index 7c09ad00a1c..00000000000 > --- a/meta-yocto-bsp/wic/genericx86.wks.in > +++ /dev/null > @@ -1,7 +0,0 @@ > -# short-description: Create an EFI disk image for genericx86* > -# long-description: Creates a partitioned EFI disk image for genericx86* machines > -part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --ondisk sda --label msdos --active --align 1024 > -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid > -part swap --ondisk sda --size 44 --label swap1 --fstype=swap > - > -bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 console=ttyS0,115200 console=tty0" > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#13203): https://lists.yoctoproject.org/g/poky/message/13203 > Mute This Topic: https://lists.yoctoproject.org/mt/102609043/6875888 > Group Owner: poky+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/poky/leave/6694438/6875888/969629750/xyzzy [ross.burton@arm.com] > -=-=-=-=-=-=-=-=-=-=-=- >
> -----Original Message----- > From: poky@lists.yoctoproject.org <poky@lists.yoctoproject.org> On Behalf > Of Ross Burton > Sent: Thursday, November 16, 2023 1:03 AM > To: poky@lists.yoctoproject.org > Subject: Re: [poky] [PATCH] genericx86*: use common mkefidisk.wks.in > > This depends on "[OE-core] [PATCH] canned-wks/mkefidisk.wks: generalise > wic image”. > > Testing by someone who actually has an x86 board and uses genericx86-64 > would be much appreciated. It should just boot as usual. They look good to us and are booting fine. Regards, Naveen > > Cheers, > Ross > > > On 15 Nov 2023, at 17:00, Ross Burton via lists.yoctoproject.org > <ross.burton=arm.com@lists.yoctoproject.org> wrote: > > > > From: Ross Burton <ross.burton@arm.com> > > > > There's no real need to use a genericx86*-specific wic file, use the > > common mkefidisk.wks.in instead. > > > > Signed-off-by: Ross Burton <ross.burton@arm.com> > > --- > > meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 +--- > > meta-yocto-bsp/wic/genericx86.wks.in | 7 ------- > > 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 > > meta-yocto-bsp/wic/genericx86.wks.in > > > > diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > > b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > > index e3badebf86d..e0cb7157135 100644 > > --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > > +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > > @@ -21,7 +21,5 @@ GLIBC_ADDONS = "nptl" > > EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" > > > > IMAGE_FSTYPES += "wic wic.bmap" > > -WKS_FILE ?= "genericx86.wks.in" > > +WKS_FILE ?= "mkefidisk.wks.in" > > EFI_PROVIDER ??= "grub-efi" > > -do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" > > -do_image_wic[recrdeptask] += "do_bootimg" > > diff --git a/meta-yocto-bsp/wic/genericx86.wks.in > > b/meta-yocto-bsp/wic/genericx86.wks.in > > deleted file mode 100644 > > index 7c09ad00a1c..00000000000 > > --- a/meta-yocto-bsp/wic/genericx86.wks.in > > +++ /dev/null > > @@ -1,7 +0,0 @@ > > -# short-description: Create an EFI disk image for genericx86* -# > > long-description: Creates a partitioned EFI disk image for genericx86* > > machines -part /boot --source bootimg-efi > > --sourceparams="loader=${EFI_PROVIDER}" --ondisk sda --label msdos > > --active --align 1024 -part / --source rootfs --ondisk sda > > --fstype=ext4 --label platform --align 1024 --use-uuid -part swap > > --ondisk sda --size 44 --label swap1 --fstype=swap > > - > > -bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 > console=ttyS0,115200 console=tty0" > > -- > > 2.34.1 > > > > > > > >
On 16 Nov 2023, at 08:16, Naveen Saini via lists.yoctoproject.org <naveen.kumar.saini=intel.com@lists.yoctoproject.org> wrote: >> Testing by someone who actually has an x86 board and uses genericx86-64 >> would be much appreciated. It should just boot as usual. > They look good to us and are booting fine. Thanks Naveen, that’s much appreciated! Ross
On 16 Nov 2023, at 08:16, Naveen Saini via lists.yoctoproject.org <naveen.kumar.saini=intel.com@lists.yoctoproject.org> wrote: >> Testing by someone who actually has an x86 board and uses genericx86-64 >> would be much appreciated. It should just boot as usual. > They look good to us and are booting fine. Thanks Naveen, that’s much appreciated! Ross
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index e3badebf86d..e0cb7157135 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -21,7 +21,5 @@ GLIBC_ADDONS = "nptl" EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" IMAGE_FSTYPES += "wic wic.bmap" -WKS_FILE ?= "genericx86.wks.in" +WKS_FILE ?= "mkefidisk.wks.in" EFI_PROVIDER ??= "grub-efi" -do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" -do_image_wic[recrdeptask] += "do_bootimg" diff --git a/meta-yocto-bsp/wic/genericx86.wks.in b/meta-yocto-bsp/wic/genericx86.wks.in deleted file mode 100644 index 7c09ad00a1c..00000000000 --- a/meta-yocto-bsp/wic/genericx86.wks.in +++ /dev/null @@ -1,7 +0,0 @@ -# short-description: Create an EFI disk image for genericx86* -# long-description: Creates a partitioned EFI disk image for genericx86* machines -part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --ondisk sda --label msdos --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid -part swap --ondisk sda --size 44 --label swap1 --fstype=swap - -bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 console=ttyS0,115200 console=tty0"