From b77307995a42ac1c9625b6b178dfb2f8608edb31 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 11 Aug 2023 19:25:29 +0200 Subject: [PATCH] coreboot/default, coreboot/fam15h: use GNU mirror for acpica Crossgcc needs acpica-unix2-20210331.tar.gz and acpica-unix2-20190703.tar.gz, but this file is gone from upstream[1], so with guix-time-machine and guix build --source, we recovered these files and published it at the addresses in the patches. [1]https://github.com/acpica/acpica/issues/883 Signed-off-by: Denis 'GNUtoo' Carikli Co-developed-by: Adrien 'neox' Bourmault Signed-off-by: Adrien 'neox' Bourmault Acked-by: Adrien 'neox' Bourmault neox: Added fam15h patches and adjusted the commit message accordingly Acked-by: Denis 'GNUtoo' Carikli Acked-by: Adrien 'neox' Bourmault --- ...-util-crossgcc-Use-mirror-for-acpica.patch | 32 +++++++++++++++++++ ...t-fam15h-use-new-upstream-for-acpica.patch | 25 +++++++++++++++ ...t-fam15h-use-new-upstream-for-acpica.patch | 25 +++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 resources/coreboot/default/patches/0016-util-crossgcc-Use-mirror-for-acpica.patch create mode 100644 resources/coreboot/fam15h_rdimm/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch create mode 100644 resources/coreboot/fam15h_udimm/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch diff --git a/resources/coreboot/default/patches/0016-util-crossgcc-Use-mirror-for-acpica.patch b/resources/coreboot/default/patches/0016-util-crossgcc-Use-mirror-for-acpica.patch new file mode 100644 index 0000000..bb66d3a --- /dev/null +++ b/resources/coreboot/default/patches/0016-util-crossgcc-Use-mirror-for-acpica.patch @@ -0,0 +1,32 @@ +From 548e802bd59a3a3a972117ca3ddc52141bb6ceb1 Mon Sep 17 00:00:00 2001 +From: Denis 'GNUtoo' Carikli +Date: Wed, 19 Jul 2023 02:14:01 +0200 +Subject: [PATCH] util/crossgcc: Use mirror for acpica + +The file is gone from upstream[1], so with guix-time-machine and guix +build --source, I recovered it and I will publish it at the address in +this patch. + +[1]https://github.com/acpica/acpica/issues/883 + +Signed-off-by: Denis 'GNUtoo' Carikli +--- + util/crossgcc/buildgcc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc +index 6c1a7a59dc2..dd32ee6ba83 100755 +--- a/util/crossgcc/buildgcc ++++ b/util/crossgcc/buildgcc +@@ -53,7 +53,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://ftp.gnu.org/pub/gnu/gnuboot/mirrors/acpica.org/acpica-unix2-${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" +-- +2.41.0 + diff --git a/resources/coreboot/fam15h_rdimm/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch b/resources/coreboot/fam15h_rdimm/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch new file mode 100644 index 0000000..fc7faca --- /dev/null +++ b/resources/coreboot/fam15h_rdimm/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch @@ -0,0 +1,25 @@ +From ba94a3f27a26d181291b5908bdd627be375eb606 Mon Sep 17 00:00:00 2001 +From: Adrien 'neox' Bourmault +Date: Tue, 8 Aug 2023 17:26:22 +0200 +Subject: [PATCH 1/1] coreboot/fam15h: use GNU mirror for acpica + +Signed-off-by: Adrien 'neox' Bourmault +--- + util/crossgcc/buildgcc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc +index b75b90a877..e3efa722f1 100755 +--- a/util/crossgcc/buildgcc ++++ b/util/crossgcc/buildgcc +@@ -73,7 +73,7 @@ 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" + GDB_ARCHIVE="https://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz" +-IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" ++IASL_ARCHIVE="https://ftp.gnu.org/pub/gnu/gnuboot/mirrors/acpica.org/acpica-unix2-${IASL_VERSION}.tar.gz" + PYTHON_ARCHIVE="https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz" + EXPAT_ARCHIVE="https://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.bz2" + # CLANG toolchain archive locations +-- +2.40.1 diff --git a/resources/coreboot/fam15h_udimm/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch b/resources/coreboot/fam15h_udimm/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch new file mode 100644 index 0000000..fc7faca --- /dev/null +++ b/resources/coreboot/fam15h_udimm/patches/0010-coreboot-fam15h-use-new-upstream-for-acpica.patch @@ -0,0 +1,25 @@ +From ba94a3f27a26d181291b5908bdd627be375eb606 Mon Sep 17 00:00:00 2001 +From: Adrien 'neox' Bourmault +Date: Tue, 8 Aug 2023 17:26:22 +0200 +Subject: [PATCH 1/1] coreboot/fam15h: use GNU mirror for acpica + +Signed-off-by: Adrien 'neox' Bourmault +--- + util/crossgcc/buildgcc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc +index b75b90a877..e3efa722f1 100755 +--- a/util/crossgcc/buildgcc ++++ b/util/crossgcc/buildgcc +@@ -73,7 +73,7 @@ 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" + GDB_ARCHIVE="https://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz" +-IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" ++IASL_ARCHIVE="https://ftp.gnu.org/pub/gnu/gnuboot/mirrors/acpica.org/acpica-unix2-${IASL_VERSION}.tar.gz" + PYTHON_ARCHIVE="https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz" + EXPAT_ARCHIVE="https://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.bz2" + # CLANG toolchain archive locations +-- +2.40.1