From a627f004f71c7516f7c01688dfdd039469b13fd4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 5 Jun 2026 20:14:38 +0200 Subject: [PATCH] support/testing: TestExternalToolchainCtngMusl: disable yescrypt The TestExternalToolchainCtngMusl use a really old toolchain generated by Crosstool-ng. Since it's used to test our external toolchain infra we want to keep it. But this test doesn't build since the last busybox bump to 1.38.0 [1]. Indeed, Busybox 1.38.0 added yescrypt algorithms that requires explicit_bzero() [2] introduced in Glibc 2.25 [3], uClibc-ng 1.0.47 [4] and musl 1.1.20 [5]. Add a new busybox config fragment to be used by old toolchains. While at it, apply the same change for TestExternalToolchainBuildrootuClibc (uClibc-ng < 1.0.47) and TestExternalToolchainBuildrootMusl (musl < 1.1.20). Note: TestExternalToolchainBuildrootuClibc configuration is reused for TestExternalToolchainCCache. [1] 5a27004cffb6bb034ff80cfac42a87bbd208755d [2] https://github.com/vda-linux/busybox_mirror/commit/80e676664e1d7a0b07f14bff44f93d1fef709cf4 [3] https://sourceware.org/git/?p=glibc.git;a=commit;h=ea1bd74defcf9d5291d14972e63105168ca9eb4f [4] https://github.com/wbx-github/uclibc-ng/commit/9e7b342fde5505c0a1d4968e9d70537ac406f640 [5] https://git.musl-libc.org/cgit/musl/commit/?id=05ac345f895098657cf44d419b5d572161ebaf43 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/14622843888 (TestExternalToolchainCtngMusl) https://gitlab.com/buildroot.org/buildroot/-/jobs/14622843887 (TestExternalToolchainCCache) https://gitlab.com/buildroot.org/buildroot/-/jobs/14622843886 (TestExternalToolchainBuildrootuClibc) https://gitlab.com/buildroot.org/buildroot/-/jobs/14622843885 (TestExternalToolchainBuildrootMusl) Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../testing/conf/busybox-for-old-toolchains.cfg | 1 + support/testing/tests/toolchain/test_external.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 support/testing/conf/busybox-for-old-toolchains.cfg diff --git a/support/testing/conf/busybox-for-old-toolchains.cfg b/support/testing/conf/busybox-for-old-toolchains.cfg new file mode 100644 index 0000000000..63fa64f51a --- /dev/null +++ b/support/testing/conf/busybox-for-old-toolchains.cfg @@ -0,0 +1 @@ +# CONFIG_USE_BB_CRYPT_YES is not set diff --git a/support/testing/tests/toolchain/test_external.py b/support/testing/tests/toolchain/test_external.py index aed3664a02..b3bb961aac 100644 --- a/support/testing/tests/toolchain/test_external.py +++ b/support/testing/tests/toolchain/test_external.py @@ -70,8 +70,10 @@ class TestExternalToolchainArmGnu(TestExternalToolchain): class TestExternalToolchainBuildrootMusl(TestExternalToolchain): + busybox_fragment = \ + infra.filepath("conf/busybox-for-old-toolchains.cfg") config = BASIC_CONFIG + \ - """ + f""" BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y @@ -83,6 +85,7 @@ class TestExternalToolchainBuildrootMusl(TestExternalToolchain): BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{busybox_fragment}" """ toolchain_prefix = "arm-linux" @@ -96,8 +99,10 @@ class TestExternalToolchainBuildrootMusl(TestExternalToolchain): class TestExternalToolchainCtngMusl(TestExternalToolchain): + busybox_fragment = \ + infra.filepath("conf/busybox-for-old-toolchains.cfg") config = BASIC_CONFIG + \ - """ + f""" BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y @@ -110,6 +115,7 @@ class TestExternalToolchainCtngMusl(TestExternalToolchain): BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{busybox_fragment}" """ toolchain_prefix = "arm-ctng-linux-musleabihf" @@ -123,8 +129,10 @@ class TestExternalToolchainCtngMusl(TestExternalToolchain): class TestExternalToolchainBuildrootuClibc(TestExternalToolchain): + busybox_fragment = \ + infra.filepath("conf/busybox-for-old-toolchains.cfg") config = BASIC_CONFIG + \ - """ + f""" BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y @@ -135,6 +143,7 @@ class TestExternalToolchainBuildrootuClibc(TestExternalToolchain): BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{busybox_fragment}" """ toolchain_prefix = "arm-linux"