From 54d0cc9a3cf31963ebf0ca85a87a7e464ef678a7 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 26 Nov 2022 11:03:03 +0000 Subject: util/crossgcc: Use GitHub for downloading IASL The download links from acpica.org [1] are not stable, and for some reason they named the release tarballs with .tar_0.gz. Thus, use the tarballs from their GitHub repository generated out of the release tags [2]. Tested locally and also IASL patch applies. [1] https://www.acpica.org/downloads [2] https://github.com/acpica/acpica/tags Original-signed-off-by: Felix Singer Original-reviewed-on: https://review.coreboot.org/c/coreboot/+/70021 Original-reviewed-by: Angel Pons Original-reviewed-by: Elyes Haouas Original-reviewed-by: Arthur Heymans Original-tested-by: build bot (Jenkins) Cherry-picked-from: 60a422736bde766489db8ff0dc2d56ab333c37cc Change-Id: I7b10dd1db4299aaef96bc29023bed874b660aba0 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/70857 Tested-by: build bot (Jenkins) Reviewed-by: Elyes Haouas --- util/crossgcc/buildgcc | 6 ++--- util/crossgcc/patches/acpica-R10_20_22_iasl.patch | 28 ++++++++++++++++++++++ .../patches/acpica-unix2-20221020_iasl.patch | 28 ---------------------- util/crossgcc/sum/R10_20_22.tar.gz.cksum | 1 + .../sum/acpica-unix2-20221020.tar.gz.cksum | 1 - 5 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 util/crossgcc/patches/acpica-R10_20_22_iasl.patch delete mode 100644 util/crossgcc/patches/acpica-unix2-20221020_iasl.patch create mode 100644 util/crossgcc/sum/R10_20_22.tar.gz.cksum delete mode 100644 util/crossgcc/sum/acpica-unix2-20221020.tar.gz.cksum diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index d0364fd25227..eea6d5a8542f 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -37,7 +37,7 @@ MPFR_VERSION=4.1.0 MPC_VERSION=1.2.1 GCC_VERSION=11.2.0 BINUTILS_VERSION=2.37 -IASL_VERSION=20221020 +IASL_VERSION="R10_20_22" # CLANG version number CLANG_VERSION=15.0.0 CMAKE_VERSION=3.24.2 @@ -52,7 +52,7 @@ MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz" MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz" GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz" BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz" -IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" +IASL_ARCHIVE="https://github.com/acpica/acpica/archive/refs/tags/${IASL_VERSION}.tar.gz" # CLANG toolchain archive locations LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz" CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz" @@ -75,7 +75,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-R10_20_22_iasl.patch b/util/crossgcc/patches/acpica-R10_20_22_iasl.patch new file mode 100644 index 000000000000..55adb83af24c --- /dev/null +++ b/util/crossgcc/patches/acpica-R10_20_22_iasl.patch @@ -0,0 +1,28 @@ +diff --git a/source/compiler/asloptions.c b/source/compiler/asloptions.c +index 4bf9465ba..14c61a122 100644 +--- a/source/compiler/asloptions.c ++++ b/source/compiler/asloptions.c +@@ -234,6 +234,7 @@ AslCommandLine ( + if (AslGbl_DoSignon) + { + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + if (AslGbl_IgnoreErrors) + { + printf ("Ignoring all errors, forcing AML file generation\n\n"); +@@ -866,6 +867,7 @@ AslDoOptions ( + case '^': + + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + exit (0); + + case 'a': +@@ -879,6 +881,7 @@ AslDoOptions ( + + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); + printf (ACPI_COMMON_BUILD_TIME); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + exit (0); + + case 'e': diff --git a/util/crossgcc/patches/acpica-unix2-20221020_iasl.patch b/util/crossgcc/patches/acpica-unix2-20221020_iasl.patch deleted file mode 100644 index 55adb83af24c..000000000000 --- a/util/crossgcc/patches/acpica-unix2-20221020_iasl.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/source/compiler/asloptions.c b/source/compiler/asloptions.c -index 4bf9465ba..14c61a122 100644 ---- a/source/compiler/asloptions.c -+++ b/source/compiler/asloptions.c -@@ -234,6 +234,7 @@ AslCommandLine ( - if (AslGbl_DoSignon) - { - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - if (AslGbl_IgnoreErrors) - { - printf ("Ignoring all errors, forcing AML file generation\n\n"); -@@ -866,6 +867,7 @@ AslDoOptions ( - case '^': - - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - exit (0); - - case 'a': -@@ -879,6 +881,7 @@ AslDoOptions ( - - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); - printf (ACPI_COMMON_BUILD_TIME); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - exit (0); - - case 'e': diff --git a/util/crossgcc/sum/R10_20_22.tar.gz.cksum b/util/crossgcc/sum/R10_20_22.tar.gz.cksum new file mode 100644 index 000000000000..4669dab43c62 --- /dev/null +++ b/util/crossgcc/sum/R10_20_22.tar.gz.cksum @@ -0,0 +1 @@ +560d9e43692e1957bcf24a9bdd663ffe77da88dd tarballs/R10_20_22.tar.gz diff --git a/util/crossgcc/sum/acpica-unix2-20221020.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20221020.tar.gz.cksum deleted file mode 100644 index 1b2b5804da6b..000000000000 --- a/util/crossgcc/sum/acpica-unix2-20221020.tar.gz.cksum +++ /dev/null @@ -1 +0,0 @@ -bb175ba614e68d43a7a863335e83d3f832d3b41c tarballs/acpica-unix2-20221020.tar.gz -- cgit v1.2.3