Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13686
-gerrit
commit 6cd2f95e2b08b83ba327ec66580871ccdc6d08d0 Author: Patrick Georgi pgeorgi@chromium.org Date: Thu Feb 11 17:22:16 2016 +0100
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 pgeorgi@chromium.org --- util/crossgcc/buildgcc | 4 ++-- util/crossgcc/patches/acpica-unix-20150619_iasl.patch | 12 ------------ util/crossgcc/patches/acpica-unix2-20150619_iasl.patch | 12 ++++++++++++ util/crossgcc/sum/acpica-unix-20150619.tar.gz.cksum | 1 - util/crossgcc/sum/acpica-unix2-20150619.tar.gz.cksum | 1 + 5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 9652496..3f41f98 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -54,7 +54,7 @@ LIBELF_ARCHIVE="http://www.mr511.de/software/libelf-$%7BLIBELF_VERSION%7D.tar.gz" GCC_ARCHIVE="http://ftpmirror.gnu.org/gcc/gcc-$%7BGCC_VERSION%7D/gcc-$%7BGCC_VERSION%7D.t..." BINUTILS_ARCHIVE="http://ftpmirror.gnu.org/binutils/binutils-$%7BBINUTILS_VERSION%7D.tar.bz2" GDB_ARCHIVE="http://ftpmirror.gnu.org/gdb/gdb-$%7BGDB_VERSION%7D.tar.xz" -IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix-$%7BIASL_VERSION%7D.tar.gz" +IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-$%7BIASL_VERSION%7D.tar.g..." PYTHON_ARCHIVE="http://www.python.org/ftp/python/$%7BPYTHON_VERSION%7D/Python-$%7BPYTHON_VER..." EXPAT_ARCHIVE="http://downloads.sourceforge.net/sourceforge/expat/expat-$%7BEXPAT_VERSION%7..." # 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-unix-20150619_iasl.patch deleted file mode 100644 index 6cb087c..0000000 --- a/util/crossgcc/patches/acpica-unix-20150619_iasl.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 -@@ -717,6 +717,7 @@ - case '^': - - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - exit (0); - - case 'a': - diff --git a/util/crossgcc/patches/acpica-unix2-20150619_iasl.patch b/util/crossgcc/patches/acpica-unix2-20150619_iasl.patch new file mode 100644 index 0000000..2c754c9 --- /dev/null +++ b/util/crossgcc/patches/acpica-unix2-20150619_iasl.patch @@ -0,0 +1,12 @@ +diff -urN acpica-unix-20150619/source/compiler/asloptions.c acpica-unix-20150619/source/compiler/asloptions.c +--- 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 '^': + + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + exit (0); + + case 'a': + 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 4047300..0000000 --- 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 0000000..523e6da --- /dev/null +++ b/util/crossgcc/sum/acpica-unix2-20150619.tar.gz.cksum @@ -0,0 +1 @@ +283c594c4b89db8e3bef8fca25021c52938987ad tarballs/acpica-unix2-20150619.tar.gz