From d3b2b9a4b2c9091b834aa5c26db2b0678d64287f Mon Sep 17 00:00:00 2001 From: Al Stone Date: Mon, 8 Jan 2018 13:33:35 -0700 Subject: [PATCH] Update to 20180105 upstream sources Signed-off-by: Al Stone --- .gitignore | 2 ++ acpica-tools.spec | 5 ++++- simple-64bit.patch | 2 +- sources | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 24c4749..1b733ce 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,5 @@ /acpitests-unix-20171110.tar.gz /acpica-unix2-20171215.tar.gz /acpitests-unix-20171215.tar.gz +/acpica-unix2-20180105.tar.gz +/acpitests-unix-20180105.tar.gz diff --git a/acpica-tools.spec b/acpica-tools.spec index 56999b6..5fd62ce 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,5 +1,5 @@ Name: acpica-tools -Version: 20171215 +Version: 20180105 Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables @@ -190,6 +190,9 @@ fi %changelog +* Mon Jan 8 2018 Al Stone - 20180105-1 +- Update to 20180105 source tree, including patch refeshes + * Mon Jan 8 2018 Al Stone - 20171215-1 - Update to 20171215 source tree, including patch refeshes diff --git a/simple-64bit.patch b/simple-64bit.patch index 8bde2f4..6ed244c 100644 --- a/simple-64bit.patch +++ b/simple-64bit.patch @@ -9,7 +9,7 @@ Author: Adrian Bunk #define ACPI_FLUSH_CPU_CACHE() #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) --#if defined(__ia64__) || defined(__x86_64__) ||\ +-#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\ - defined(__aarch64__) || defined(__PPC64__) ||\ - defined(__s390x__) +#if defined(__LP64__) diff --git a/sources b/sources index 5a124c0..bf13b49 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (acpica-unix2-20171215.tar.gz) = 3e28025bb23e3c118f294ab0696ccbfb05dcf83d7c860b859ae97516f05a12dad750a850dce81ed50c4056b34d6ea9b130fb248154767506655dce7de8d924bb -SHA512 (acpitests-unix-20171215.tar.gz) = b405e87f18b15bd01540d32c021a7b900139abd7e698b55786ccbaf8536c5068087a8ba1e7adbb69e0954cdc6b347e9a88428f1e8f889e0e9eb3a472c11235f9 +SHA512 (acpica-unix2-20180105.tar.gz) = 5466481397174309fce4134317fc98cf00770a4ef7481608e68c718a60c11e78d04833ff183c7e2ec3a40835ceb3351e9f193d217460880afd2c6ec16592213f +SHA512 (acpitests-unix-20180105.tar.gz) = 2baecb9d884b5b497d3453780e3a30f3d01e6b7569af4cb7c13ee2db143eab18bd8a44d8b0f452d527bdf3be090cc6d17c8b947a307a94ff55c4262b87739c80