From f1b2c555e845737fd7a5f1671c03217b02084d1d Mon Sep 17 00:00:00 2001 From: Al Stone Date: Mon, 28 Jul 2014 15:06:33 -0600 Subject: [PATCH] Refresh the patches so everything applies properly. Signed-off-by: Al Stone --- aapits-linux.patch | 6 +++--- aapits-makefile.patch | 42 ++++++++++++++++++++++--------------- acpica-tools.spec | 1 + debian-big_endian.patch | 6 +++--- debian-unaligned.patch | 4 ++-- re-enable-big-endian.patch | Bin 17704 -> 888 bytes 6 files changed, 34 insertions(+), 25 deletions(-) diff --git a/aapits-linux.patch b/aapits-linux.patch index 6a385ac..008ee0e 100644 --- a/aapits-linux.patch +++ b/aapits-linux.patch @@ -318,9 +318,9 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- diff -urN acpica-unix2-20130626/tests/aapits/Makefile acpica-unix2-20130626-aapits/tests/aapits/Makefile --- acpica-unix2-20130626/tests/aapits/Makefile 2013-01-17 12:48:29.000000000 -0700 +++ acpica-unix2-20130626-aapits/tests/aapits/Makefile 2013-07-25 15:17:09.309236422 -0600 -@@ -194,7 +194,7 @@ - CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include - +@@ -199,7 +199,7 @@ + CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_APITS -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include + -acpiexec : $(patsubst %.c,%.o, $(SRCS)) +$(PROG) : $(patsubst %.c,%.o, $(SRCS)) diff --git a/aapits-makefile.patch b/aapits-makefile.patch index d3e8264..cfba797 100644 --- a/aapits-makefile.patch +++ b/aapits-makefile.patch @@ -1,19 +1,27 @@ -diff -urN acpica-unix2-20140325/tests/aapits/Makefile acpica-unix2-20140325/tests/aapits/Makefile ---- acpica-unix2-20140325/tests/aapits/Makefile 2014-04-05 14:23:14.683636794 -0600 -+++ acpica-unix2-20140325-aapits/tests/aapits/Makefile 2014-04-05 15:10:57.879184598 -0600 -@@ -20,6 +20,7 @@ - ../../source/components/hardware/hwxface.c \ +diff -Naur acpica-unix2-20140724.orig/tests/aapits/Makefile acpica-unix2-20140724/tests/aapits/Makefile +--- acpica-unix2-20140724.orig/tests/aapits/Makefile 2014-07-28 14:32:23.884529332 -0600 ++++ acpica-unix2-20140724/tests/aapits/Makefile 2014-07-28 14:50:27.367982860 -0600 +@@ -16,6 +16,7 @@ + atosxfwrap.c \ + osunixxf.c \ + ../../source/common/ahids.c \ ++ ../../source/common/ahuuids.c \ ../../source/common/cmfsize.c \ ../../source/common/getopt.c \ -+ ../../source/common/ahids.c \ - ../../source/components/debugger/dbcmds.c \ - ../../source/components/debugger/dbconvert.c \ - ../../source/components/debugger/dbdisply.c \ -@@ -154,6 +155,7 @@ - ../../source/components/tables/tbfadt.c \ - ../../source/components/tables/tbfind.c \ - ../../source/components/tables/tbinstal.c \ -+ ../../source/components/tables/tbdata.c \ - ../../source/components/tables/tbprint.c \ - ../../source/components/tables/tbutils.c \ - ../../source/components/tables/tbxface.c \ + ../../source/components/hardware/hwtimer.c \ +@@ -174,6 +175,7 @@ + ../../source/components/utilities/utexcep.c \ + ../../source/components/utilities/utfileio.c \ + ../../source/components/utilities/utglobal.c \ ++ ../../source/components/utilities/uthex.c \ + ../../source/components/utilities/utids.c \ + ../../source/components/utilities/utinit.c \ + ../../source/components/utilities/utlock.c \ +@@ -189,6 +191,7 @@ + ../../source/components/utilities/utstate.c \ + ../../source/components/utilities/utstring.c \ + ../../source/components/utilities/uttrack.c \ ++ ../../source/components/utilities/utuuid.c \ + ../../source/components/utilities/utxface.c \ + ../../source/components/utilities/utxferror.c \ + ../../source/components/utilities/utxfinit.c \ diff --git a/acpica-tools.spec b/acpica-tools.spec index 56a22ad..934a4e9 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -194,6 +194,7 @@ fi * Mon Jul 28 2014 Al Stone - 20140724-1 - Update to latest upstream. Closes BZ#1114275. - This update adds support for the 5.1 version of the ACPI specification +- Refresh patches so everything applies properly. * Fri Jun 6 2014 Dan Horák - 20140424-3 - refresh the big endian patch so it applies correctly, fixes build on big endians diff --git a/debian-big_endian.patch b/debian-big_endian.patch index 1edf80a..6c03e76 100644 --- a/debian-big_endian.patch +++ b/debian-big_endian.patch @@ -2415,7 +2415,7 @@ diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpic diff -up acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endian acpica-unix2-20140424/source/include/platform/aclinux.h --- acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endian 2014-04-24 11:49:06.000000000 -0400 +++ acpica-unix2-20140424/source/include/platform/aclinux.h 2014-06-06 20:44:28.781825238 -0400 -@@ -116,6 +116,7 @@ +@@ -155,6 +155,7 @@ #include #include #include @@ -2423,7 +2423,7 @@ diff -up acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endi /* Define/disable kernel-specific declarators */ -@@ -132,8 +133,7 @@ +@@ -167,8 +168,7 @@ #define ACPI_FLUSH_CPU_CACHE() #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) @@ -2433,7 +2433,7 @@ diff -up acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endi #define ACPI_MACHINE_WIDTH 64 #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -@@ -144,6 +144,10 @@ +@@ -179,6 +179,10 @@ #define ACPI_USE_NATIVE_DIVIDE #endif diff --git a/debian-unaligned.patch b/debian-unaligned.patch index a8704ea..56e206c 100644 --- a/debian-unaligned.patch +++ b/debian-unaligned.patch @@ -118,7 +118,7 @@ diff --git a/source/include/actypes.h b/source/include/actypes.h index 07fb7d5..08bdf2f 100644 --- a/source/include/actypes.h +++ b/source/include/actypes.h -@@ -142,6 +155,19 @@ typedef COMPILER_DEPENDENT_INT64 INT64; +@@ -143,6 +156,19 @@ typedef COMPILER_DEPENDENT_INT64 INT64; */ #define ACPI_THREAD_ID UINT64 @@ -138,7 +138,7 @@ index 07fb7d5..08bdf2f 100644 /******************************************************************************* * -@@ -168,19 +181,6 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS; +@@ -169,19 +182,6 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS; #define ACPI_SIZE_MAX ACPI_UINT64_MAX #define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */ diff --git a/re-enable-big-endian.patch b/re-enable-big-endian.patch index d8bd7112d76d386785e65007d6579a1aaa31de35..57cd43b6d5b2309b81798ef4f878b79a8188c98b 100644 GIT binary patch delta 32 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