| Message ID | 20210912141140.253778-8-romain.naour@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [01/16] support/testing: test_file_capabilities: bump to kernel 4.19.204 | expand |
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes: > To avoid spending some time to build the x86_64 toolchain (~20min), > switch to corei7 cpu (Nahalem) and use the prebuilt Bootlin toolchain. > We have to use the "stable" Bootlin toolchain to use the same kernel version > for the toolchain kernel headers and the running kernel. > With the "bleeding-edge" toolchain we have the "kernel too old" issue > (running kernel 4.19 vs kernel headers 5.4) > Runtime tested locally. > Signed-off-by: Romain Naour <romain.naour@gmail.com> > Cc: Peter Korsgaard <peter@korsgaard.com> Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py index 35e659a74d..1ce132c242 100644 --- a/support/testing/tests/package/test_docker_compose.py +++ b/support/testing/tests/package/test_docker_compose.py @@ -7,10 +7,9 @@ class TestDockerCompose(infra.basetest.BRTest): config = \ """ BR2_x86_64=y - BR2_x86_core2=y - BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - BR2_KERNEL_HEADERS_4_19=y - BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="{}" BR2_ROOTFS_POST_SCRIPT_ARGS="{}" @@ -53,7 +52,7 @@ class TestDockerCompose(infra.basetest.BRTest): self.emulator.boot(arch="x86_64", kernel=kernel, kernel_cmdline=["root=/dev/vda", "console=ttyS0"], - options=["-cpu", "core2duo", + options=["-cpu", "Nehalem", "-m", "512M", "-device", "virtio-rng-pci", "-drive", "file={},format=raw,if=virtio".format(rootfs),
To avoid spending some time to build the x86_64 toolchain (~20min), switch to corei7 cpu (Nahalem) and use the prebuilt Bootlin toolchain. We have to use the "stable" Bootlin toolchain to use the same kernel version for the toolchain kernel headers and the running kernel. With the "bleeding-edge" toolchain we have the "kernel too old" issue (running kernel 4.19 vs kernel headers 5.4) Runtime tested locally. Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Peter Korsgaard <peter@korsgaard.com> --- support/testing/tests/package/test_docker_compose.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)