CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitbake/conf: Default to zstd compressed image output

Browse Source 
Switch our default qemu images to use .zst compressed images by default
since this is the output format we release during the release process
and is the one that users would prefer to download. This makes the release
process use the actual generated output from the system and avoids post
processing.

(From OE-Core rev: aa5f60d1fcb716a2b2174dffcaf35442bff1f1fb)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2025-08-01 11:55:13 +01:00
parent b5f38c5ce3
commit 45f3bdce44
8 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
View File

@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
MCMACHINE:virtclass-mcextend-musl = "qemux86-64"
MCMACHINE:virtclass-mcextend-tiny = "qemux86"
MCIMGTYPE:virtclass-mcextend-musl = "ext4"
MCIMGTYPE:virtclass-mcextend-musl = "ext4.zst"
MCIMGTYPE:virtclass-mcextend-tiny = "cpio.gz"
MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}"

2
meta/classes-recipe/qemuboot.bbclass
View File

@ -97,7 +97,7 @@ QB_MEM ?= "-m 256"
QB_SMP ?= ""
QB_SERIAL_OPT ?= "-serial mon:stdio -serial null"
QB_DEFAULT_KERNEL ?= "${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1", "${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin", "${KERNEL_IMAGETYPE}", d)}"
QB_DEFAULT_FSTYPE ?= "ext4"
QB_DEFAULT_FSTYPE ?= "ext4.zst"
QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
QB_OPT_APPEND ?= ""
QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@"

4
meta/conf/bitbake.conf
View File

@ -839,8 +839,8 @@ include conf/bblock.conf
DL_DIR ?= "${TOPDIR}/downloads"
SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
IMAGE_FSTYPES ?= "tar.gz"
IMAGE_FSTYPES_DEBUGFS ?= "tar.gz"
IMAGE_FSTYPES ?= "tar.zst"
IMAGE_FSTYPES_DEBUGFS ?= "tar.zst"
INITRAMFS_FSTYPES ?= "cpio.gz"
# The maximum size in Kbytes for the generated initramfs image size.

2
meta/conf/machine/include/qemu.inc
View File

@ -8,7 +8,7 @@ MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
MACHINEOVERRIDES =. "qemuall:"
IMAGE_FSTYPES += "tar.bz2 ext4"
IMAGE_FSTYPES += "tar.zst ext4.zst"
# Don't include kernels in standard images
RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""

2
meta/conf/machine/include/riscv/qemuriscv.inc
View File

@ -11,7 +11,7 @@ KEEPUIMAGE = "no"
SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0"
IMAGE_FSTYPES += "ext4 wic.qcow2"
IMAGE_FSTYPES += "ext4.zst wic.qcow2"
WKS_FILE ?= "qemuriscv.wks"

2
meta/conf/machine/include/x86/x86-base.inc
View File

@ -8,7 +8,7 @@
MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \
acpi serial usbgadget alsa"
IMAGE_FSTYPES ?= "wic"
IMAGE_FSTYPES ?= "wic.zst"
KERNEL_IMAGETYPE ?= "bzImage"

1
meta/lib/oeqa/selftest/cases/gdbserver.py
View File

@ -19,6 +19,7 @@ class GdbServerTest(OESelftestTestCase):
features = """
IMAGE_GEN_DEBUGFS = "1"
IMAGE_FSTYPES += "tar.bz2"
IMAGE_FSTYPES_DEBUGFS = "tar.bz2"
CORE_IMAGE_EXTRA_INSTALL = "gdbserver"
"""

6
meta/lib/oeqa/selftest/cases/runqemu.py
View File

@ -195,6 +195,12 @@ class QemuTest(OESelftestTestCase):
cls.cmd_common = "runqemu nographic snapshot"
cls.qemuboot_conf = "%s.qemuboot.conf" % (cls.image_link_name)
cls.qemuboot_conf = os.path.join(cls.deploy_dir_image, cls.qemuboot_conf)
cls.write_config(cls,
"""
IMAGE_FSTYPES += "tar.bz2"
""")
bitbake(cls.recipe)
def _start_qemu_shutdown_check_if_shutdown_succeeded(self, qemu, timeout):