From 85bb946362c570af0c4e4ba79853d7509c2df1cc Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 11 Feb 2016 17:22:16 +0100 Subject: [PATCH] crossgcc: Use acpica-unix2 over acpica-unix Apparently acpica-unix is shipped under "A non-open source license (the 'Intel license')" while acpica-unix2 comes under GPLv2/BSD dual license. (see https://acpica.org/Licensing) So go with unix2. Change-Id: I412812187bbf488eb4ad6d7fb8d2840f2f5e06d4 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/13686 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- util/crossgcc/buildgcc | 4 ++-- ...x-20150619_iasl.patch => acpica-unix2-20150619_iasl.patch} | 4 ++-- util/crossgcc/sum/acpica-unix-20150619.tar.gz.cksum | 1 - util/crossgcc/sum/acpica-unix2-20150619.tar.gz.cksum | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) rename util/crossgcc/patches/{acpica-unix-20150619_iasl.patch => acpica-unix2-20150619_iasl.patch} (63%) delete mode 100644 util/crossgcc/sum/acpica-unix-20150619.tar.gz.cksum create mode 100644 util/crossgcc/sum/acpica-unix2-20150619.tar.gz.cksum diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 9652496bc5..3f41f9891d 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -54,7 +54,7 @@ LIBELF_ARCHIVE="http://www.mr511.de/software/libelf-${LIBELF_VERSION}.tar.gz" GCC_ARCHIVE="http://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.bz2" BINUTILS_ARCHIVE="http://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.bz2" GDB_ARCHIVE="http://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz" -IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix-${IASL_VERSION}.tar.gz" +IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" PYTHON_ARCHIVE="http://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz" EXPAT_ARCHIVE="http://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.gz" # CLANG toolchain archive locations @@ -72,7 +72,7 @@ LIBELF_DIR="libelf-${LIBELF_VERSION}" GCC_DIR="gcc-${GCC_VERSION}" BINUTILS_DIR="binutils-${BINUTILS_VERSION}" GDB_DIR="gdb-${GDB_VERSION}" -IASL_DIR="acpica-unix-${IASL_VERSION}" +IASL_DIR="acpica-unix2-${IASL_VERSION}" PYTHON_DIR="Python-${PYTHON_VERSION}" EXPAT_DIR="expat-${EXPAT_VERSION}" # CLANG toolchain directories diff --git a/util/crossgcc/patches/acpica-unix-20150619_iasl.patch b/util/crossgcc/patches/acpica-unix2-20150619_iasl.patch similarity index 63% rename from util/crossgcc/patches/acpica-unix-20150619_iasl.patch rename to util/crossgcc/patches/acpica-unix2-20150619_iasl.patch index 6cb087c187..2c754c98cf 100644 --- a/util/crossgcc/patches/acpica-unix-20150619_iasl.patch +++ b/util/crossgcc/patches/acpica-unix2-20150619_iasl.patch @@ -1,6 +1,6 @@ diff -urN acpica-unix-20150619/source/compiler/asloptions.c acpica-unix-20150619/source/compiler/asloptions.c ---- acpica-unix-20150619/source/compiler/asloptions.c 2015-06-19 08:56:19.000000000 -0600 -+++ acpica-unix-20150619/source/compiler/asloptions.c 2015-12-08 10:44:58.816669240 -0700 +--- acpica-unix2-20150619/source/compiler/asloptions.c 2015-06-19 08:56:19.000000000 -0600 ++++ acpica-unix2-20150619/source/compiler/asloptions.c 2015-12-08 10:44:58.816669240 -0700 @@ -717,6 +717,7 @@ case '^': diff --git a/util/crossgcc/sum/acpica-unix-20150619.tar.gz.cksum b/util/crossgcc/sum/acpica-unix-20150619.tar.gz.cksum deleted file mode 100644 index 404730043d..0000000000 --- a/util/crossgcc/sum/acpica-unix-20150619.tar.gz.cksum +++ /dev/null @@ -1 +0,0 @@ -ccc86513f10c47762bf46bf4d348c8cbda4336f5 tarballs/acpica-unix-20150619.tar.gz diff --git a/util/crossgcc/sum/acpica-unix2-20150619.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20150619.tar.gz.cksum new file mode 100644 index 0000000000..523e6dadd9 --- /dev/null +++ b/util/crossgcc/sum/acpica-unix2-20150619.tar.gz.cksum @@ -0,0 +1 @@ +283c594c4b89db8e3bef8fca25021c52938987ad tarballs/acpica-unix2-20150619.tar.gz