| Message ID | 20260404012859.2463603-1-zizuzacker@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | qemuarm/qemuarm64: add WKS_FILE for wic image creation | expand |
On Sat 2026-04-04 @ 08:28:59 AM, Zk47T via lists.openembedded.org wrote: > Some of the oe-selftest test cases require generating a wic file, but > the qemuarm and qemuarm64 machines didn't have one defined, which > caused tests to fail when attempting to build WIC images. Which tests are failing due to lack of wks files? All of the oe-selftests in wic.py are passing for me. Some oe-selftests generate wks files on the fly, and others use pre-existing wks files; both scenarios work fine, and one doesn't depend on the other. I don't understand how adding a wks file is related to tests which generate their own wks files. > This creates a default qemuarm.wks providing a single 5GB ext4 root > partition and assigns it via the WKS_FILE variable in both the > qemuarm.conf and qemuarm64.conf machine configurations. > [YOCTO #14963] > > Signed-off-by: Zk47T <zizuzacker@gmail.com> > --- > meta/conf/machine/qemuarm.conf | 2 ++ > meta/conf/machine/qemuarm64.conf | 2 ++ > scripts/lib/wic/canned-wks/qemuarm.wks | 3 +++ > 3 files changed, 7 insertions(+) > create mode 100644 scripts/lib/wic/canned-wks/qemuarm.wks > > diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf > index 943ce7c16a..685483c545 100644 > --- a/meta/conf/machine/qemuarm.conf > +++ b/meta/conf/machine/qemuarm.conf > @@ -29,3 +29,5 @@ QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device v > QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" > > KMACHINE:qemuarm = "qemuarma15" > + > +WKS_FILE ?= "qemuarm.wks" > diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf > index a096d964db..14b9f838e2 100644 > --- a/meta/conf/machine/qemuarm64.conf > +++ b/meta/conf/machine/qemuarm64.conf > @@ -28,3 +28,5 @@ QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio > # Virtio serial console > QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" > QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" > + > +WKS_FILE ?= "qemuarm.wks" > diff --git a/scripts/lib/wic/canned-wks/qemuarm.wks b/scripts/lib/wic/canned-wks/qemuarm.wks > new file mode 100644 > index 0000000000..01d9fbf10b > --- /dev/null > +++ b/scripts/lib/wic/canned-wks/qemuarm.wks > @@ -0,0 +1,3 @@ > +# short-description: Create qcow2 image for ARM QEMU machines Whether or not a qcow2 image is created is not something over which the wks file has control. > + > +part / --source rootfs --fstype=ext4 --label root --align 4096 --size 5G > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#234619): https://lists.openembedded.org/g/openembedded-core/message/234619 > Mute This Topic: https://lists.openembedded.org/mt/118668207/900817 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [twoerner@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 943ce7c16a..685483c545 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -29,3 +29,5 @@ QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device v QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" KMACHINE:qemuarm = "qemuarma15" + +WKS_FILE ?= "qemuarm.wks" diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index a096d964db..14b9f838e2 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -28,3 +28,5 @@ QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio # Virtio serial console QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" + +WKS_FILE ?= "qemuarm.wks" diff --git a/scripts/lib/wic/canned-wks/qemuarm.wks b/scripts/lib/wic/canned-wks/qemuarm.wks new file mode 100644 index 0000000000..01d9fbf10b --- /dev/null +++ b/scripts/lib/wic/canned-wks/qemuarm.wks @@ -0,0 +1,3 @@ +# short-description: Create qcow2 image for ARM QEMU machines + +part / --source rootfs --fstype=ext4 --label root --align 4096 --size 5G
Some of the oe-selftest test cases require generating a wic file, but the qemuarm and qemuarm64 machines didn't have one defined, which caused tests to fail when attempting to build WIC images. This creates a default qemuarm.wks providing a single 5GB ext4 root partition and assigns it via the WKS_FILE variable in both the qemuarm.conf and qemuarm64.conf machine configurations. [YOCTO #14963] Signed-off-by: Zk47T <zizuzacker@gmail.com> --- meta/conf/machine/qemuarm.conf | 2 ++ meta/conf/machine/qemuarm64.conf | 2 ++ scripts/lib/wic/canned-wks/qemuarm.wks | 3 +++ 3 files changed, 7 insertions(+) create mode 100644 scripts/lib/wic/canned-wks/qemuarm.wks