diff options
| author | Mikko Rapeli <mikko.rapeli@linaro.org> | 2024-10-23 15:08:38 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-10-25 15:12:22 +0100 |
| commit | 18c123d8da59a6f8483662cb0977089d7a0736f5 (patch) | |
| tree | af6732af6239356bad42aaed7a17f0e24f925412 /meta-selftest | |
| parent | a7c025cc11731e08bb23a700eabe9faf0c513c30 (diff) | |
| download | poky-18c123d8da59a6f8483662cb0977089d7a0736f5.tar.gz | |
oeqa selftest wic.py: support UKIs via uki.bbclass
Use label to detect rootfs since UKI with kernel command
line is generated before rootfs is generated by wic.
Adapt wic tests to build and boot uki.bbclass generated
UKIs.
Keeping one UKI test in wic.py and rest of the UKI features
are tested with dedicated uki.py test. Add plain non-UKI
systemd-boot tests to wic suite for aarch64 and x86.
(From OE-Core rev: 3f94256b977637d4276f82db7c20b8b5e57b9d86)
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-selftest')
| -rw-r--r-- | meta-selftest/wic/test_efi_plugin.wks | 5 | ||||
| -rw-r--r-- | meta-selftest/wic/test_efi_plugin_plain_systemd-boot.wks | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/meta-selftest/wic/test_efi_plugin.wks b/meta-selftest/wic/test_efi_plugin.wks index 1603d6c4bb..e876a4be0e 100644 --- a/meta-selftest/wic/test_efi_plugin.wks +++ b/meta-selftest/wic/test_efi_plugin.wks | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | # short-description: This file is used in oe-selftest wic module to test efi plugin | 1 | # short-description: This file is used in oe-selftest wic module to test efi plugin |
| 2 | 2 | part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --active --align 1024 --use-uuid | |
| 3 | part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,create-unified-kernel-image=true,initrd=${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES}" --active --align 1024 --use-uuid | 3 | part / --source rootfs --fstype=ext4 --align 1024 --use-uuid --label root |
| 4 | part / --source rootfs --fstype=ext4 --align 1024 --use-uuid | ||
| 5 | 4 | ||
| 6 | bootloader --timeout=0 --append="console=ttyS0,115200n8" | 5 | bootloader --timeout=0 --append="console=ttyS0,115200n8" |
diff --git a/meta-selftest/wic/test_efi_plugin_plain_systemd-boot.wks b/meta-selftest/wic/test_efi_plugin_plain_systemd-boot.wks new file mode 100644 index 0000000000..2745c19e85 --- /dev/null +++ b/meta-selftest/wic/test_efi_plugin_plain_systemd-boot.wks | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | # short-description: This file is used in oe-selftest wic module to test efi plugin | ||
| 2 | part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES}" --active --align 1024 --use-uuid | ||
| 3 | part / --source rootfs --fstype=ext4 --align 1024 --use-uuid | ||
| 4 | |||
| 5 | bootloader --timeout=0 --append="console=ttyS0,115200n8" | ||