Message ID | 20250804135214.1416031-1-richard.purdie@linuxfoundation.org (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | genericarm64/genericx86-64/heabglebone-yocto: Default to zstd compressed image output | expand |
Hi Ross/Jon/Mikko, On 8/4/25 9:52 AM, Richard Purdie via lists.yoctoproject.org wrote: > We want to release compressed images since these are much easier for > users to download. Change the default generated output to match this > and build the output we want to release directly. > > One test needs tweaking to since it uses an uncompressed image. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +- > meta-yocto-bsp/conf/machine/genericarm64.conf | 2 +- > meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 +- > meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | 1 + > 4 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf > index db9cfec497a..63d7f942144 100644 > --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf > +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf > @@ -11,7 +11,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" > DEFAULTTUNE ?= "cortexa8hf-neon" > include conf/machine/include/arm/armv7a/tune-cortexa8.inc > > -IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" > +IMAGE_FSTYPES += "tar.zst jffs2.zst wic.zst wic.bmap" > EXTRA_IMAGECMD:jffs2 = "-lnp " > WKS_FILE ?= "beaglebone-yocto.wks" > MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-devicetree" > diff --git a/meta-yocto-bsp/conf/machine/genericarm64.conf b/meta-yocto-bsp/conf/machine/genericarm64.conf > index 722bc7d4a66..094af0eb9cb 100644 > --- a/meta-yocto-bsp/conf/machine/genericarm64.conf > +++ b/meta-yocto-bsp/conf/machine/genericarm64.conf > @@ -24,7 +24,7 @@ INITRAMFS_MAXSIZE = "200000" > INITRAMFS_IMAGE ?= "core-image-initramfs-boot" > PACKAGE_INSTALL:append:pn-core-image-initramfs-boot = " ${MACHINE_EXTRA_RRECOMMENDS}" > > -IMAGE_FSTYPES ?= "wic" > +IMAGE_FSTYPES ?= "wic.zst" While we are changing this, should we not also add wic.bmap to match the others? > WKS_FILE ?= "genericarm64.wks.in" > > EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" > diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > index 943604c01cc..76a742b3916 100644 > --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc > @@ -16,7 +16,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \ > > MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" > > -IMAGE_FSTYPES += "wic wic.bmap" > +IMAGE_FSTYPES += "wic.zst wic.bmap" > WKS_FILE ?= "genericx86.wks.in" > EFI_PROVIDER ??= "grub-efi" > do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" > diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py > index 6fc6925f694..781763d1f15 100644 > --- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py > +++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py > @@ -19,6 +19,7 @@ class Systemdboot(OESelftestTestCase): > # Set EFI_PROVIDER = "systemdboot" and MACHINE = "genericx86-64" in conf/local.conf > features = 'EFI_PROVIDER = "systemd-boot"\n' > features += 'MACHINE = "genericx86-64"\n' > + features += 'IMAGE_FSTYPES += "wic"\n' > features += 'COMPATIBLE_MACHINE:pn-ssh-pregen-hostkeys:genericx86-64 = "genericx86-64"\n' > self.append_config(features) > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#13706): https://lists.yoctoproject.org/g/poky/message/13706 > Mute This Topic: https://lists.yoctoproject.org/mt/114530300/3619240 > Group Owner: poky+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/poky/unsub [bill.mills@linaro.org] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index db9cfec497a..63d7f942144 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -11,7 +11,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" DEFAULTTUNE ?= "cortexa8hf-neon" include conf/machine/include/arm/armv7a/tune-cortexa8.inc -IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" +IMAGE_FSTYPES += "tar.zst jffs2.zst wic.zst wic.bmap" EXTRA_IMAGECMD:jffs2 = "-lnp " WKS_FILE ?= "beaglebone-yocto.wks" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-devicetree" diff --git a/meta-yocto-bsp/conf/machine/genericarm64.conf b/meta-yocto-bsp/conf/machine/genericarm64.conf index 722bc7d4a66..094af0eb9cb 100644 --- a/meta-yocto-bsp/conf/machine/genericarm64.conf +++ b/meta-yocto-bsp/conf/machine/genericarm64.conf @@ -24,7 +24,7 @@ INITRAMFS_MAXSIZE = "200000" INITRAMFS_IMAGE ?= "core-image-initramfs-boot" PACKAGE_INSTALL:append:pn-core-image-initramfs-boot = " ${MACHINE_EXTRA_RRECOMMENDS}" -IMAGE_FSTYPES ?= "wic" +IMAGE_FSTYPES ?= "wic.zst" WKS_FILE ?= "genericarm64.wks.in" EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 943604c01cc..76a742b3916 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -16,7 +16,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" -IMAGE_FSTYPES += "wic wic.bmap" +IMAGE_FSTYPES += "wic.zst wic.bmap" WKS_FILE ?= "genericx86.wks.in" EFI_PROVIDER ??= "grub-efi" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py index 6fc6925f694..781763d1f15 100644 --- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py +++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py @@ -19,6 +19,7 @@ class Systemdboot(OESelftestTestCase): # Set EFI_PROVIDER = "systemdboot" and MACHINE = "genericx86-64" in conf/local.conf features = 'EFI_PROVIDER = "systemd-boot"\n' features += 'MACHINE = "genericx86-64"\n' + features += 'IMAGE_FSTYPES += "wic"\n' features += 'COMPATIBLE_MACHINE:pn-ssh-pregen-hostkeys:genericx86-64 = "genericx86-64"\n' self.append_config(features)
We want to release compressed images since these are much easier for users to download. Change the default generated output to match this and build the output we want to release directly. One test needs tweaking to since it uses an uncompressed image. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +- meta-yocto-bsp/conf/machine/genericarm64.conf | 2 +- meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 +- meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-)