mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 16:01:54 -09:00
Code Issues Packages Projects Releases Wiki Activity

support/testing/tests/package/test_docker_compose.py: update kernel & VM CPU

Browse Source 
Since commit 947dbc92a2 the Bootlin
stable toolchain uses headers 5.4, which can lead to build outputs
incompatible with older kernels. Update to the latest 5.4 kernel to
avoid this. The kernel config is updated according to the requirements
of current Docker, runc, and crun.

Additionally switch the CPU of the test VM to Haswell, to avoid
dockerd failing to start with a "This program can only be run on AMD64
processors with v3 microarchitecture support" error.

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Fiona Klute (WIWA)
2025-08-29 13:31:18 +02:00
committed by Romain Naour
parent a1daf153bf
commit efe00fb3fb
2 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
support/testing/tests/package/test_docker_compose.py
View File

@@ -17,7 +17,7 @@ class BaseTestDockerCompose(infra.basetest.BRTest):
BR2_ROOTFS_POST_SCRIPT_ARGS="{}"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.262"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.296"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}"
BR2_PACKAGE_PYTHON3=y
@@ -59,7 +59,7 @@ class BaseTestDockerCompose(infra.basetest.BRTest):
self.emulator.boot(arch="x86_64",
kernel=kernel,
kernel_cmdline=["root=/dev/vda", "console=ttyS0"],
options=["-cpu", "Nehalem",
options=["-cpu", "Haswell",
"-m", "512M",
"-device", "virtio-rng-pci",
"-drive", "file={},format=raw,if=virtio".format(rootfs),