From ca1f63b50ea6192b0aa0615aa72bdc95a027b191 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 8 Jul 2024 16:20:07 +0200 Subject: [PATCH] tools: remove linaro toolchains not working anymore, no update, bootlin can replace them... --- .github/workflows/aarch64_toolchain.yml | 2 - .github/workflows/arm_toolchain.yml | 5 --- ci/Makefile | 17 ++----- tools/cross_compile.sh | 60 ------------------------- 4 files changed, 4 insertions(+), 80 deletions(-) diff --git a/.github/workflows/aarch64_toolchain.yml b/.github/workflows/aarch64_toolchain.yml index 161673e..451191c 100644 --- a/.github/workflows/aarch64_toolchain.yml +++ b/.github/workflows/aarch64_toolchain.yml @@ -11,8 +11,6 @@ jobs: # https://go.dev/doc/install/source#environment arm64, # alias to aarch64 arm64be, # alias to aarch64be - aarch64-linux-gnu, # linaro - aarch64_be-linux-gnu, # linaro aarch64, # bootlin aarch64be # bootlin ] diff --git a/.github/workflows/arm_toolchain.yml b/.github/workflows/arm_toolchain.yml index 2b5037b..fa68324 100644 --- a/.github/workflows/arm_toolchain.yml +++ b/.github/workflows/arm_toolchain.yml @@ -11,11 +11,6 @@ jobs: # https://go.dev/doc/install/source#environment arm, # alias to armv7-eabihf armeb, # alias to armv7eb-eabihf - arm-linux-gnueabihf, # linaro - armv8l-linux-gnueabihf, # linaro - arm-linux-gnueabi, # linaro - armeb-linux-gnueabihf, # linaro - armeb-linux-gnueabi, # linaro armv7-eabihf, # bootlin armebv7-eabihf #bootlin ] diff --git a/ci/Makefile b/ci/Makefile index 4d3649e..f9f5bbb 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -79,13 +79,6 @@ help: @echo -e "\t${BOLD}clean_toolchains${RESET}: Remove ALL cache and docker image." @echo @echo -e "\tWith ${BOLD}${RESET}:" - @echo -e "\t\t${BOLD}arm-linux-gnueabihf${RESET} (linaro toolchain)" - @echo -e "\t\t${BOLD}armv8l-linux-gnueabihf${RESET} (linaro toolchain)" - @echo -e "\t\t${BOLD}arm-linux-gnueabi${RESET} (linaro toolchain)" - @echo -e "\t\t${BOLD}armeb-linux-gnueabihf${RESET} (linaro toolchain)" - @echo -e "\t\t${BOLD}armeb-linux-gnueabi${RESET} (linaro toolchain)" - @echo -e "\t\t${BOLD}aarch64-linux-gnu${RESET} (linaro toolchain)" - @echo -e "\t\t${BOLD}aarch64_be-linux-gnu${RESET} (linaro toolchain)" @echo -e "\t\t${BOLD}armv7-eabihf${RESET} (alias: arm) (bootlin toolchain)" @echo -e "\t\t${BOLD}armebv7-eabihf${RESET} (alias: armeb) (bootlin toolchain)" @echo -e "\t\t${BOLD}aarch64${RESET} (alias: arm64) (bootlin toolchain)" @@ -289,16 +282,14 @@ clean_platforms: $(addprefix clean_, $(PLATFORMS)) ## TOOLCHAIN ## ############### TOOLCHAIN_TARGETS = \ - arm-linux-gnueabihf armv8l-linux-gnueabihf arm-linux-gnueabi armeb-linux-gnueabihf armeb-linux-gnueabi \ - aarch64-linux-gnu aarch64_be-linux-gnu \ - mips mips32-r6 mips32-r2 \ - mipsle mips32el-r6 mips32el-r2 \ - mips64 mips64-r6 mips64-r2 \ - mips64le mips64el-r6 mips64el-r2 \ arm armv7-eabihf \ armeb armebv7-eabihf \ arm64 aarch64 \ arm64be aarch64be \ + mips mips32-r6 mips32-r2 \ + mipsle mips32el-r6 mips32el-r2 \ + mips64 mips64-r6 mips64-r2 \ + mips64le mips64el-r6 mips64el-r2 \ ppc ppc-440fp ppc-e500mc \ ppc64 ppc64-power8 \ ppc64le ppc64le-power8 \ diff --git a/tools/cross_compile.sh b/tools/cross_compile.sh index 84958a8..9f07006 100755 --- a/tools/cross_compile.sh +++ b/tools/cross_compile.sh @@ -311,50 +311,6 @@ local -r LIBC_DIR=${GCC_DIR}/${GCC_PREFIX}/lib/${FLAVOUR}/${LIBC_DIR_SUFFIX} QEMU_ARGS+=( -E LD_PRELOAD="${LIBC_DIR}/libstdc++.so.6:${LIBC_DIR}/libgcc_s.so.1" ) } -function expand_linaro_config() { - #ref: https://releases.linaro.org/components/toolchain/binaries/ - local -r LINARO_VERSION=7.5-2019.12 - local -r LINARO_ROOT_URL=https://releases.linaro.org/components/toolchain/binaries/${LINARO_VERSION} - - local -r GCC_VERSION=7.5.0-2019.12 - local -r GCC_URL=${LINARO_ROOT_URL}/${TARGET}/gcc-linaro-${GCC_VERSION}-x86_64_${TARGET}.tar.xz - local -r GCC_RELATIVE_DIR="gcc-linaro-${GCC_VERSION}-x86_64_${TARGET}" - unpack "${GCC_URL}" "${GCC_RELATIVE_DIR}" - - local -r SYSROOT_VERSION=2.25-2019.12 - local -r SYSROOT_URL=${LINARO_ROOT_URL}/${TARGET}/sysroot-glibc-linaro-${SYSROOT_VERSION}-${TARGET}.tar.xz - local -r SYSROOT_RELATIVE_DIR=sysroot-glibc-linaro-${SYSROOT_VERSION}-${TARGET} - unpack "${SYSROOT_URL}" "${SYSROOT_RELATIVE_DIR}" - - local -r SYSROOT_DIR=${ARCHIVE_DIR}/${SYSROOT_RELATIVE_DIR} - local -r STAGING_DIR=${ARCHIVE_DIR}/${SYSROOT_RELATIVE_DIR}-stage - local -r GCC_DIR=${ARCHIVE_DIR}/${GCC_RELATIVE_DIR} - - # Write a Toolchain file - # note: This is manadatory to use a file in order to have the CMake variable - # 'CMAKE_CROSSCOMPILING' set to TRUE. - # ref: https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-linux - cat >"$TOOLCHAIN_FILE" <