From 90753398b6e394efedae423004648d5f7c303fd4 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 10 Jul 2023 23:56:18 +0000 Subject: [PATCH] util/crossgcc: Fix broken link by Intel to acpica tarball All requests to acpica.org are redirected to an intel.com site now, which breaks our buildgcc script as it's unable to download the source tarball. Use GitHub again as it's a more reliable source. *rant* Change-Id: Ie4570539d6c8abe59295e5a29b323b091e939f90 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/76399 Reviewed-by: Eric Lai Reviewed-by: Nicholas Chin Reviewed-by: Matt DeVillier Reviewed-by: Paul Menzel Reviewed-by: Krystian Hebel Tested-by: build bot (Jenkins) --- util/crossgcc/buildgcc | 8 ++++---- ...x2-20230628_iasl.patch => acpica-R06_28_23_iasl.patch} | 0 util/crossgcc/sum/R06_28_23.tar.gz.cksum | 1 + util/crossgcc/sum/acpica-unix2-20230628.tar.gz.cksum | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) rename util/crossgcc/patches/{acpica-unix2-20230628_iasl.patch => acpica-R06_28_23_iasl.patch} (100%) create mode 100644 util/crossgcc/sum/R06_28_23.tar.gz.cksum delete mode 100644 util/crossgcc/sum/acpica-unix2-20230628.tar.gz.cksum diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index e994e7630a..ee458def04 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -39,7 +39,7 @@ MPFR_VERSION=4.2.0 MPC_VERSION=1.3.1 GCC_VERSION=11.3.0 BINUTILS_VERSION=2.40 -IASL_VERSION=20230628 +IASL_VERSION="R06_28_23" # CLANG version number CLANG_VERSION=16.0.6 CMAKE_VERSION=3.26.4 @@ -51,7 +51,7 @@ MPFR_ARCHIVE="mpfr-${MPFR_VERSION}.tar.xz" MPC_ARCHIVE="mpc-${MPC_VERSION}.tar.gz" GCC_ARCHIVE="gcc-${GCC_VERSION}.tar.xz" BINUTILS_ARCHIVE="binutils-${BINUTILS_VERSION}.tar.xz" -IASL_ARCHIVE="acpica-unix2-${IASL_VERSION}.tar.gz" +IASL_ARCHIVE="${IASL_VERSION}.tar.gz" # CLANG toolchain FILE locations LLVM_ARCHIVE="llvm-${CLANG_VERSION}.src.tar.xz" CLANG_ARCHIVE="clang-${CLANG_VERSION}.src.tar.xz" @@ -71,7 +71,7 @@ MPFR_BASE_URL="https://ftpmirror.gnu.org/mpfr" MPC_BASE_URL="https://ftpmirror.gnu.org/mpc" GCC_BASE_URL="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}" BINUTILS_BASE_URL="https://ftpmirror.gnu.org/binutils" -IASL_BASE_URL="https://acpica.org/sites/acpica/files" +IASL_BASE_URL="https://github.com/acpica/acpica/archive/refs/tags" # CLANG toolchain archive locations LLVM_BASE_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}" CLANG_BASE_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}" @@ -94,7 +94,7 @@ MPC_DIR="mpc-${MPC_VERSION}" GCC_DIR="gcc-${GCC_VERSION}" # shellcheck disable=SC2034 BINUTILS_DIR="binutils-${BINUTILS_VERSION}" -IASL_DIR="acpica-unix2-${IASL_VERSION}" +IASL_DIR="acpica-${IASL_VERSION}" # CLANG toolchain directories LLVM_DIR="llvm-${CLANG_VERSION}.src" CLANG_DIR="clang-${CLANG_VERSION}.src" diff --git a/util/crossgcc/patches/acpica-unix2-20230628_iasl.patch b/util/crossgcc/patches/acpica-R06_28_23_iasl.patch similarity index 100% rename from util/crossgcc/patches/acpica-unix2-20230628_iasl.patch rename to util/crossgcc/patches/acpica-R06_28_23_iasl.patch diff --git a/util/crossgcc/sum/R06_28_23.tar.gz.cksum b/util/crossgcc/sum/R06_28_23.tar.gz.cksum new file mode 100644 index 0000000000..37fa6ccfee --- /dev/null +++ b/util/crossgcc/sum/R06_28_23.tar.gz.cksum @@ -0,0 +1 @@ +e37c8dd560bacb0190f2a0306a64f63564206c65 tarballs/R06_28_23.tar.gz diff --git a/util/crossgcc/sum/acpica-unix2-20230628.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20230628.tar.gz.cksum deleted file mode 100644 index e4a83af66e..0000000000 --- a/util/crossgcc/sum/acpica-unix2-20230628.tar.gz.cksum +++ /dev/null @@ -1 +0,0 @@ -7bdf0962efd6a24f36a5f7e366cc7257e3e6f23d tarballs/acpica-unix2-20230628.tar.gz