From 49cc81057b35f07223a98ef36f5f3ec28a626ecc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 9 Jan 2025 00:05:12 +0100 Subject: [PATCH] toolchain/toolchain-external: remove Bootlin nios2 external toolchain We are going to remove nios2 support, so remove the Bootlin nios2 external toolchain. Remove this toolchain from the Buildroot testsuite. Signed-off-by: Romain Naour Signed-off-by: Julien Olivain --- Config.in.legacy | 12 +++++ .../tests/toolchain/test_external_bootlin.py | 28 ----------- .../Config.in.options | 50 ------------------- .../toolchain-external-bootlin.hash | 4 -- .../toolchain-external-bootlin.mk | 12 ----- 5 files changed, 12 insertions(+), 94 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index fd12f8d49f..54c251be1f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2025.02" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE + bool "Bootlin nios2 glibc bleeding-edge toolchain removed" + select BR2_LEGACY + help + The nios2 Bootlin toolchains have been removed. + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE + bool "Bootlin nios2 glibc stable toolchain removed" + select BR2_LEGACY + help + The nios2 Bootlin toolchains have been removed. + config BR2_PACKAGE_DIRECTFB bool "directfb has been removed" select BR2_LEGACY diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index c137444cbc..6bcebf80c0 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -1653,34 +1653,6 @@ class TestExternalToolchainBootlinMips64r6eln32UclibcStable(TestExternalToolchai TestExternalToolchain.common_check(self) -class TestExternalToolchainBootlinNios2GlibcBleedingEdge(TestExternalToolchain): - config = """ - BR2_nios2=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "nios2-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - -class TestExternalToolchainBootlinNios2GlibcStable(TestExternalToolchain): - config = """ - BR2_nios2=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "nios2-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - class TestExternalToolchainBootlinOpenriscGlibcBleedingEdge(TestExternalToolchain): config = """ BR2_or1k=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 098e44fc36..1bbc0239e6 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -22,7 +22,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_mips64 && BR2_mips_64 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT default y if BR2_mips64el && BR2_mips_64 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT default y if BR2_mips64el && BR2_mips_64r6 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT - default y if BR2_nios2 default y if BR2_or1k default y if BR2_powerpc && BR2_powerpc_440fp default y if BR2_powerpc && BR2_powerpc_e300c3 @@ -2782,55 +2781,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE - bool "nios2 glibc bleeding-edge 2024.05-1" - depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN - select BR2_TOOLCHAIN_HAS_OPENMP - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - help - Bootlin toolchain for the nios2 architecture, using the - glibc C library. This is a bleeding-edge version, which - means it is using the latest versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE - bool "nios2 glibc stable 2024.05-1" - depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_OPENMP - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - help - Bootlin toolchain for the nios2 architecture, using the - glibc C library. This is a stable version, which means it - is using stable and proven versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE bool "openrisc glibc bleeding-edge 2024.05-1" depends on BR2_or1k diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash index adc42531cc..daa5c4cc79 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -212,10 +212,6 @@ sha256 cce09fc456b592a993a7c8d182cdd1f04397a8160f176d9ac6799d8e2e09cef7 mips64 sha256 e12b6536fbacb624b0d938345fb29b202c8b174893d0d8fbefde46fbe727c729 mips64r6el-n32--uclibc--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2024.05-1.sha256 sha256 a0db853f4c40d120d22e6762ca4bff64e0c3e3db74ab59950967917aeb9bf330 mips64r6el-n32--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2024.05-1.sha256 -sha256 5d034a538a8613ef324ae96f097c122ed99574ec8707e3274743e4d79efd374c nios2--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2024.05-1.sha256 -sha256 db7a12e0b22037f3aad01cd126b5f1bfe7dc514e37f8c484eb587b861f20fbcd nios2--glibc--stable-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2024.05-1.sha256 sha256 0de17cd13642f71f112d086c1df4b34670440ceb459478a0f3d55007945633ca openrisc--glibc--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2024.05-1.sha256 diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk index 18639db1b3..a3d8ce215c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -642,18 +642,6 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_E TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz