[Buildroot] [PATCH v3 1/2] support/testing/tests/package/test_docker_compose.py: update kernel & VM CPU

Wed Sep 10 21:01:54 UTC 2025

Hello Fiona, All,

Le 29/08/2025 à 13:31, Fiona Klute a écrit :
> From: "Fiona Klute (WIWA)" <fiona.klute at gmx.de>
> 
> Since commit 947dbc92a20c5acea7882166cae7893e6ea661e1 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.

Series applied to master, thanks.

Best regards,
Romain

> 
> Signed-off-by: Fiona Klute (WIWA) <fiona.klute at gmx.de>
> ---
> Changes v1 -> v2:
> * Add this patch to avoid test failures observed with what's now patch
>   2 alone, though not necessarily caused by it
> 
>  .../testing/conf/docker-compose-kernel.config | 57 +++++++++++++------
>  .../tests/package/test_docker_compose.py      |  4 +-
>  2 files changed, 41 insertions(+), 20 deletions(-)
> 
> diff --git a/support/testing/conf/docker-compose-kernel.config b/support/testing/conf/docker-compose-kernel.config
> index 4d30a578ec..fd28da7a4a 100644
> --- a/support/testing/conf/docker-compose-kernel.config
> +++ b/support/testing/conf/docker-compose-kernel.config
> @@ -1,10 +1,22 @@
>  # CONFIG_SWAP is not set
>  CONFIG_SYSVIPC=y
> +CONFIG_POSIX_MQUEUE=y
>  # CONFIG_CROSS_MEMORY_ATTACH is not set
>  CONFIG_HIGH_RES_TIMERS=y
> +CONFIG_CGROUPS=y
> +CONFIG_MEMCG=y
> +CONFIG_BLK_CGROUP=y
> +CONFIG_CGROUP_SCHED=y
> +CONFIG_CGROUP_PIDS=y
> +CONFIG_CGROUP_FREEZER=y
> +CONFIG_CPUSETS=y
> +CONFIG_CGROUP_DEVICE=y
> +CONFIG_CGROUP_CPUACCT=y
> +CONFIG_CGROUP_BPF=y
> +CONFIG_BPF_SYSCALL=y
>  # CONFIG_COMPAT_BRK is not set
> +CONFIG_SMP=y
>  # CONFIG_X86_EXTENDED_PLATFORM is not set
> -CONFIG_IOSF_MBI=y
>  CONFIG_MCORE2=y
>  # CONFIG_X86_MCE is not set
>  # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
> @@ -12,9 +24,8 @@ CONFIG_LEGACY_VSYSCALL_NONE=y
>  # CONFIG_SUSPEND is not set
>  # CONFIG_ACPI is not set
>  CONFIG_CPU_IDLE=y
> -CONFIG_PCI_MSI=y
>  # CONFIG_VIRTUALIZATION is not set
> -# CONFIG_IOSCHED_CFQ is not set
> +CONFIG_BLK_DEV_THROTTLING=y
>  # CONFIG_MQ_IOSCHED_DEADLINE is not set
>  # CONFIG_MQ_IOSCHED_KYBER is not set
>  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> @@ -25,23 +36,36 @@ CONFIG_UNIX=y
>  CONFIG_INET=y
>  CONFIG_IP_MULTICAST=y
>  CONFIG_IP_ADVANCED_ROUTER=y
> -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
> -# CONFIG_INET_XFRM_MODE_TUNNEL is not set
> -# CONFIG_INET_XFRM_MODE_BEET is not set
> -# CONFIG_IPV6 is not set
> -# CONFIG_NF_CONNTRACK_PROCFS is not set
> -# CONFIG_NF_CT_PROTO_DCCP is not set
> -# CONFIG_NF_CT_PROTO_SCTP is not set
> -# CONFIG_NF_CT_PROTO_UDPLITE is not set
> +# CONFIG_IPV6_SIT is not set
> +CONFIG_NETFILTER=y
> +CONFIG_NF_CONNTRACK=y
> +CONFIG_NETFILTER_XT_MARK=y
> +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
> +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
> +CONFIG_NETFILTER_XT_MATCH_IPVS=y
>  CONFIG_IP_VS=y
>  CONFIG_IP_VS_RR=y
>  CONFIG_IP_VS_NFCT=y
> -# CONFIG_BRIDGE_IGMP_SNOOPING is not set
> +CONFIG_IP_NF_IPTABLES=y
> +CONFIG_IP_NF_FILTER=y
> +CONFIG_IP_NF_NAT=y
> +CONFIG_IP_NF_TARGET_MASQUERADE=y
> +CONFIG_IP_NF_MANGLE=y
> +CONFIG_IP_NF_RAW=y
> +CONFIG_IP6_NF_IPTABLES=y
> +CONFIG_IP6_NF_FILTER=y
> +CONFIG_IP6_NF_MANGLE=y
> +CONFIG_IP6_NF_RAW=y
> +CONFIG_IP6_NF_NAT=y
> +CONFIG_IP6_NF_TARGET_MASQUERADE=y
> +CONFIG_BRIDGE=y
>  # CONFIG_WIRELESS is not set
> +CONFIG_PCI=y
>  CONFIG_DEVTMPFS=y
>  CONFIG_DEVTMPFS_MOUNT=y
>  CONFIG_VIRTIO_BLK=y
>  CONFIG_NETDEVICES=y
> +CONFIG_VETH=y
>  CONFIG_VIRTIO_NET=y
>  # CONFIG_ETHERNET is not set
>  # CONFIG_WLAN is not set
> @@ -52,26 +76,23 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
>  # CONFIG_DEVMEM is not set
>  CONFIG_SERIAL_8250=y
>  CONFIG_SERIAL_8250_CONSOLE=y
> -# CONFIG_SERIAL_8250_LPSS is not set
> -# CONFIG_SERIAL_8250_MID is not set
>  # CONFIG_HW_RANDOM_INTEL is not set
>  # CONFIG_HW_RANDOM_AMD is not set
>  # CONFIG_HW_RANDOM_VIA is not set
>  CONFIG_HW_RANDOM_VIRTIO=y
> -# CONFIG_DEVPORT is not set
>  # CONFIG_HWMON is not set
>  # CONFIG_USB_SUPPORT is not set
>  CONFIG_RTC_CLASS=y
>  CONFIG_VIRTIO_PCI=y
> -# CONFIG_VIRTIO_PCI_LEGACY is not set
> +CONFIG_VIRTIO_MMIO=y
>  # CONFIG_X86_PLATFORM_DEVICES is not set
>  # CONFIG_IOMMU_SUPPORT is not set
>  CONFIG_EXT4_FS=y
> +CONFIG_OVERLAY_FS=y
>  CONFIG_TMPFS=y
>  # CONFIG_MISC_FILESYSTEMS is not set
>  # CONFIG_NETWORK_FILESYSTEMS is not set
> +CONFIG_KEYS=y
>  CONFIG_SECURITYFS=y
> -# CONFIG_CRYPTO_ECHAINIV is not set
>  # CONFIG_CRYPTO_HW is not set
> -# CONFIG_UNUSED_SYMBOLS is not set
>  CONFIG_UNWINDER_FRAME_POINTER=y
> diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py
> index 6a8f6f4010..a96c9d1481 100644
> --- a/support/testing/tests/package/test_docker_compose.py
> +++ b/support/testing/tests/package/test_docker_compose.py
> @@ -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),