From 5686df49c60936768667abfd2a58d17a2af26cfc Mon Sep 17 00:00:00 2001 From: Al Stone Date: Oct 15 2015 18:42:11 +0000 Subject: Refresh all of the patches. --- diff --git a/debian/patches/OPT_LDFLAGS.patch b/debian/patches/OPT_LDFLAGS.patch index 1c71839..b009a19 100644 --- a/debian/patches/OPT_LDFLAGS.patch +++ b/debian/patches/OPT_LDFLAGS.patch @@ -1,7 +1,7 @@ -Index: acpica-unix-20150818/generate/unix/Makefile.config +Index: acpica-unix-20150930/generate/unix/Makefile.config =================================================================== ---- acpica-unix-20150818.orig/generate/unix/Makefile.config -+++ acpica-unix-20150818/generate/unix/Makefile.config +--- acpica-unix-20150930.orig/generate/unix/Makefile.config ++++ acpica-unix-20150930/generate/unix/Makefile.config @@ -23,6 +23,9 @@ # OPT_CFLAGS can be overridden on the make command line by # adding OPT_CFLAGS="..." to the invocation. diff --git a/debian/patches/add-testing.patch b/debian/patches/add-testing.patch index 5b74058..4d71626 100644 --- a/debian/patches/add-testing.patch +++ b/debian/patches/add-testing.patch @@ -1,7 +1,7 @@ -Index: acpica-unix-20150818/Makefile +Index: acpica-unix-20150930/Makefile =================================================================== ---- acpica-unix-20150818.orig/Makefile -+++ acpica-unix-20150818/Makefile +--- acpica-unix-20150930.orig/Makefile ++++ acpica-unix-20150930/Makefile @@ -20,3 +20,22 @@ else include generate/unix/Makefile.config include generate/unix/Makefile.common diff --git a/debian/patches/asllookup-miscompare.patch b/debian/patches/asllookup-miscompare.patch index 47f4251..5a1f2c0 100644 --- a/debian/patches/asllookup-miscompare.patch +++ b/debian/patches/asllookup-miscompare.patch @@ -1,7 +1,7 @@ -Index: acpica-unix-20150818/source/compiler/asllookup.c +Index: acpica-unix-20150930/source/compiler/asllookup.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/asllookup.c -+++ acpica-unix-20150818/source/compiler/asllookup.c +--- acpica-unix-20150930.orig/source/compiler/asllookup.c ++++ acpica-unix-20150930/source/compiler/asllookup.c @@ -119,6 +119,7 @@ LkIsObjectUsed ( { ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); diff --git a/debian/patches/asllookup-ppc64.patch b/debian/patches/asllookup-ppc64.patch index ce5e915..25714d0 100644 --- a/debian/patches/asllookup-ppc64.patch +++ b/debian/patches/asllookup-ppc64.patch @@ -1,7 +1,7 @@ -Index: acpica-unix-20150818/source/compiler/asllookup.c +Index: acpica-unix-20150930/source/compiler/asllookup.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/asllookup.c -+++ acpica-unix-20150818/source/compiler/asllookup.c +--- acpica-unix-20150930.orig/source/compiler/asllookup.c ++++ acpica-unix-20150930/source/compiler/asllookup.c @@ -176,7 +176,8 @@ LkIsObjectUsed ( * We ignore the predefined methods since often, not * all arguments are needed or used. diff --git a/debian/patches/debian-big_endian.patch b/debian/patches/debian-big_endian.patch index a71b231..8567690 100644 --- a/debian/patches/debian-big_endian.patch +++ b/debian/patches/debian-big_endian.patch @@ -1,7 +1,7 @@ -Index: acpica-unix-20150818/source/compiler/aslcodegen.c +Index: acpica-unix-20150930/source/compiler/aslcodegen.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslcodegen.c -+++ acpica-unix-20150818/source/compiler/aslcodegen.c +--- acpica-unix-20150930.orig/source/compiler/aslcodegen.c ++++ acpica-unix-20150930/source/compiler/aslcodegen.c @@ -249,16 +249,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { @@ -239,10 +239,10 @@ Index: acpica-unix-20150818/source/compiler/aslcodegen.c case AML_RAW_DATA_BUFFER: -Index: acpica-unix-20150818/source/compiler/aslopcodes.c +Index: acpica-unix-20150930/source/compiler/aslopcodes.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslopcodes.c -+++ acpica-unix-20150818/source/compiler/aslopcodes.c +--- acpica-unix-20150930.orig/source/compiler/aslopcodes.c ++++ acpica-unix-20150930/source/compiler/aslopcodes.c @@ -531,6 +531,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; @@ -261,10 +261,10 @@ Index: acpica-unix-20150818/source/compiler/aslopcodes.c } /* -Index: acpica-unix-20150818/source/compiler/aslrestype1.c +Index: acpica-unix-20150930/source/compiler/aslrestype1.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslrestype1.c -+++ acpica-unix-20150818/source/compiler/aslrestype1.c +--- acpica-unix-20150930.orig/source/compiler/aslrestype1.c ++++ acpica-unix-20150930/source/compiler/aslrestype1.c @@ -143,6 +143,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -461,10 +461,10 @@ Index: acpica-unix-20150818/source/compiler/aslrestype1.c RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -Index: acpica-unix-20150818/source/compiler/aslrestype1i.c +Index: acpica-unix-20150930/source/compiler/aslrestype1i.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslrestype1i.c -+++ acpica-unix-20150818/source/compiler/aslrestype1i.c +--- acpica-unix-20150930.orig/source/compiler/aslrestype1i.c ++++ acpica-unix-20150930/source/compiler/aslrestype1i.c @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -601,10 +601,10 @@ Index: acpica-unix-20150818/source/compiler/aslrestype1i.c + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); return (Rnode); } -Index: acpica-unix-20150818/source/compiler/aslrestype2.c +Index: acpica-unix-20150930/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslrestype2.c -+++ acpica-unix-20150818/source/compiler/aslrestype2.c +--- acpica-unix-20150930.orig/source/compiler/aslrestype2.c ++++ acpica-unix-20150930/source/compiler/aslrestype2.c @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -700,10 +700,10 @@ Index: acpica-unix-20150818/source/compiler/aslrestype2.c /* Point to end-of-descriptor for vendor data */ -Index: acpica-unix-20150818/source/compiler/aslrestype2d.c +Index: acpica-unix-20150930/source/compiler/aslrestype2d.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslrestype2d.c -+++ acpica-unix-20150818/source/compiler/aslrestype2d.c +--- acpica-unix-20150930.orig/source/compiler/aslrestype2d.c ++++ acpica-unix-20150930/source/compiler/aslrestype2d.c @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1059,10 +1059,10 @@ Index: acpica-unix-20150818/source/compiler/aslrestype2d.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20150818/source/compiler/aslrestype2e.c +Index: acpica-unix-20150930/source/compiler/aslrestype2e.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslrestype2e.c -+++ acpica-unix-20150818/source/compiler/aslrestype2e.c +--- acpica-unix-20150930.orig/source/compiler/aslrestype2e.c ++++ acpica-unix-20150930/source/compiler/aslrestype2e.c @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1168,10 +1168,10 @@ Index: acpica-unix-20150818/source/compiler/aslrestype2e.c Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); -Index: acpica-unix-20150818/source/compiler/aslrestype2q.c +Index: acpica-unix-20150930/source/compiler/aslrestype2q.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslrestype2q.c -+++ acpica-unix-20150818/source/compiler/aslrestype2q.c +--- acpica-unix-20150930.orig/source/compiler/aslrestype2q.c ++++ acpica-unix-20150930/source/compiler/aslrestype2q.c @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; @@ -1510,10 +1510,10 @@ Index: acpica-unix-20150818/source/compiler/aslrestype2q.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20150818/source/compiler/aslrestype2s.c +Index: acpica-unix-20150930/source/compiler/aslrestype2s.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslrestype2s.c -+++ acpica-unix-20150818/source/compiler/aslrestype2s.c +--- acpica-unix-20150930.orig/source/compiler/aslrestype2s.c ++++ acpica-unix-20150930/source/compiler/aslrestype2s.c @@ -290,6 +290,9 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; @@ -1827,10 +1827,10 @@ Index: acpica-unix-20150818/source/compiler/aslrestype2s.c MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -Index: acpica-unix-20150818/source/compiler/aslrestype2w.c +Index: acpica-unix-20150930/source/compiler/aslrestype2w.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslrestype2w.c -+++ acpica-unix-20150818/source/compiler/aslrestype2w.c +--- acpica-unix-20150930.orig/source/compiler/aslrestype2w.c ++++ acpica-unix-20150930/source/compiler/aslrestype2w.c @@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -2174,10 +2174,10 @@ Index: acpica-unix-20150818/source/compiler/aslrestype2w.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20150818/source/include/acmacros.h +Index: acpica-unix-20150930/source/include/acmacros.h =================================================================== ---- acpica-unix-20150818.orig/source/include/acmacros.h -+++ acpica-unix-20150818/source/include/acmacros.h +--- acpica-unix-20150930.orig/source/include/acmacros.h ++++ acpica-unix-20150930/source/include/acmacros.h @@ -100,7 +100,8 @@ /* 32-bit source, 16/32/64 destination */ @@ -2215,10 +2215,10 @@ Index: acpica-unix-20150818/source/include/acmacros.h #define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s) #define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s) -Index: acpica-unix-20150818/source/include/platform/aclinux.h +Index: acpica-unix-20150930/source/include/platform/aclinux.h =================================================================== ---- acpica-unix-20150818.orig/source/include/platform/aclinux.h -+++ acpica-unix-20150818/source/include/platform/aclinux.h +--- acpica-unix-20150930.orig/source/include/platform/aclinux.h ++++ acpica-unix-20150930/source/include/platform/aclinux.h @@ -167,6 +167,7 @@ #include #include diff --git a/debian/patches/debian-unaligned.patch b/debian/patches/debian-unaligned.patch index 8530046..7456aa7 100644 --- a/debian/patches/debian-unaligned.patch +++ b/debian/patches/debian-unaligned.patch @@ -15,11 +15,11 @@ Signed-off-by: Paolo Bonzini source/include/actypes.h | 26 +++++++++++++------------- 3 file modificati, 32 inserzioni(+), 21 rimozioni(-) -Index: acpica-unix-20150818/source/compiler/asltree.c +Index: acpica-unix-20150930/source/compiler/asltree.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/asltree.c -+++ acpica-unix-20150818/source/compiler/asltree.c -@@ -862,28 +862,31 @@ TrCreateValuedLeafNode ( +--- acpica-unix-20150930.orig/source/compiler/asltree.c ++++ acpica-unix-20150930/source/compiler/asltree.c +@@ -863,28 +863,31 @@ TrCreateValuedLeafNode ( "\nCreateValuedLeafNode Ln/Col %u/%u NewNode %p Op %s Value %8.8X%8.8X ", Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), ACPI_FORMAT_UINT64 (Value)); @@ -56,7 +56,7 @@ Index: acpica-unix-20150818/source/compiler/asltree.c break; case PARSEOP_METHOD: -@@ -893,12 +896,14 @@ TrCreateValuedLeafNode ( +@@ -894,12 +897,14 @@ TrCreateValuedLeafNode ( case PARSEOP_INTEGER: @@ -71,10 +71,10 @@ Index: acpica-unix-20150818/source/compiler/asltree.c break; } -Index: acpica-unix-20150818/source/components/executer/exoparg2.c +Index: acpica-unix-20150930/source/components/executer/exoparg2.c =================================================================== ---- acpica-unix-20150818.orig/source/components/executer/exoparg2.c -+++ acpica-unix-20150818/source/components/executer/exoparg2.c +--- acpica-unix-20150930.orig/source/components/executer/exoparg2.c ++++ acpica-unix-20150930/source/components/executer/exoparg2.c @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; @@ -115,10 +115,10 @@ Index: acpica-unix-20150818/source/components/executer/exoparg2.c break; case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */ -Index: acpica-unix-20150818/source/include/actypes.h +Index: acpica-unix-20150930/source/include/actypes.h =================================================================== ---- acpica-unix-20150818.orig/source/include/actypes.h -+++ acpica-unix-20150818/source/include/actypes.h +--- acpica-unix-20150930.orig/source/include/actypes.h ++++ acpica-unix-20150930/source/include/actypes.h @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 */ #define ACPI_THREAD_ID UINT64 diff --git a/debian/patches/fix_ftbfs_debian-hurd.patch b/debian/patches/fix_ftbfs_debian-hurd.patch index 0063e97..8b933b9 100644 --- a/debian/patches/fix_ftbfs_debian-hurd.patch +++ b/debian/patches/fix_ftbfs_debian-hurd.patch @@ -3,10 +3,10 @@ Fix FTBFS on hurd-i386. source/include/platform/acenv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: acpica-unix-20150818/source/include/platform/acenv.h +Index: acpica-unix-20150930/source/include/platform/acenv.h =================================================================== ---- acpica-unix-20150818.orig/source/include/platform/acenv.h -+++ acpica-unix-20150818/source/include/platform/acenv.h +--- acpica-unix-20150930.orig/source/include/platform/acenv.h ++++ acpica-unix-20150930/source/include/platform/acenv.h @@ -173,7 +173,7 @@ * *****************************************************************************/ diff --git a/debian/patches/fix_ftbfs_debian-kfreebsd.patch b/debian/patches/fix_ftbfs_debian-kfreebsd.patch index d4881fe..08a589b 100644 --- a/debian/patches/fix_ftbfs_debian-kfreebsd.patch +++ b/debian/patches/fix_ftbfs_debian-kfreebsd.patch @@ -22,10 +22,10 @@ Thanks in advance source/include/platform/acenv.h | 3 +++ 1 file changed, 3 insertions(+) -Index: acpica-unix-20150818/source/include/platform/acenv.h +Index: acpica-unix-20150930/source/include/platform/acenv.h =================================================================== ---- acpica-unix-20150818.orig/source/include/platform/acenv.h -+++ acpica-unix-20150818/source/include/platform/acenv.h +--- acpica-unix-20150930.orig/source/include/platform/acenv.h ++++ acpica-unix-20150930/source/include/platform/acenv.h @@ -162,6 +162,9 @@ #endif diff --git a/debian/patches/name-miscompare.patch b/debian/patches/name-miscompare.patch index ac7a222..0cdc4f7 100644 --- a/debian/patches/name-miscompare.patch +++ b/debian/patches/name-miscompare.patch @@ -4,10 +4,10 @@ to be compared were being treated as 32-bit ints, and not strings. Hence, the characters were re-ordered incorrectly, mismatching the assumptions made in the remainder of the function. -Index: acpica-unix-20150818/source/compiler/aslanalyze.c +Index: acpica-unix-20150930/source/compiler/aslanalyze.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslanalyze.c -+++ acpica-unix-20150818/source/compiler/aslanalyze.c +--- acpica-unix-20150930.orig/source/compiler/aslanalyze.c ++++ acpica-unix-20150930/source/compiler/aslanalyze.c @@ -445,7 +445,7 @@ ApCheckForGpeNameConflict ( /* Need a null-terminated string version of NameSeg */ diff --git a/debian/patches/re-enable-big-endian.patch b/debian/patches/re-enable-big-endian.patch index a198b30..2b9b576 100644 --- a/debian/patches/re-enable-big-endian.patch +++ b/debian/patches/re-enable-big-endian.patch @@ -2,11 +2,11 @@ Re-enable use of these tools on big-endian machines. Al Stone -Index: acpica-unix-20150818/source/compiler/aslmain.c +Index: acpica-unix-20150930/source/compiler/aslmain.c =================================================================== ---- acpica-unix-20150818.orig/source/compiler/aslmain.c -+++ acpica-unix-20150818/source/compiler/aslmain.c -@@ -339,18 +339,6 @@ main ( +--- acpica-unix-20150930.orig/source/compiler/aslmain.c ++++ acpica-unix-20150930/source/compiler/aslmain.c +@@ -340,18 +340,6 @@ main ( int ReturnStatus = 0; diff --git a/debian/patches/rename-file.patch b/debian/patches/rename-file.patch deleted file mode 100644 index 86d0be3..0000000 --- a/debian/patches/rename-file.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -Naur acpica-unix2-20150818/source/tools/acpinames/acpinames.h acpica-unix2-20150818.fixes/source/tools/acpinames/acpinames.h ---- acpica-unix2-20150818/source/tools/acpinames/acpinames.h 1969-12-31 17:00:00.000000000 -0700 -+++ acpica-unix2-20150818.fixes/source/tools/acpinames/acpinames.h 2015-09-09 17:40:12.850371450 -0600 -@@ -0,0 +1,58 @@ -+/****************************************************************************** -+ * -+ * Module Name: acpinames.h - Common include for AcpiNames utility -+ * -+ *****************************************************************************/ -+ -+/* -+ * Copyright (C) 2000 - 2015, Intel Corp. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions, and the following disclaimer, -+ * without modification. -+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer -+ * substantially similar to the "NO WARRANTY" disclaimer below -+ * ("Disclaimer") and any redistribution must be conditioned upon -+ * including a substantially similar Disclaimer requirement for further -+ * binary redistribution. -+ * 3. Neither the names of the above-listed copyright holders nor the names -+ * of any contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License ("GPL") version 2 as published by the Free -+ * Software Foundation. -+ * -+ * NO WARRANTY -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR -+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGES. -+ */ -+ -+#ifndef _ACPINAMES_H -+#define _ACPINAMES_H -+ -+#include "acpi.h" -+#include "accommon.h" -+#include "acapps.h" -+#include "acutils.h" -+#include "../acpiexec/aecommon.h" -+ -+#include -+ -+#define ACPI_MAX_INIT_TABLES (32) -+ -+extern BOOLEAN AcpiGbl_NsLoadOnly; -+#endif -diff -Naur acpica-unix2-20150818/source/tools/acpinames/AcpiNames.h acpica-unix2-20150818.fixes/source/tools/acpinames/AcpiNames.h ---- acpica-unix2-20150818/source/tools/acpinames/AcpiNames.h 2015-08-18 14:11:26.000000000 -0600 -+++ acpica-unix2-20150818.fixes/source/tools/acpinames/AcpiNames.h 1969-12-31 17:00:00.000000000 -0700 -@@ -1,58 +0,0 @@ --/****************************************************************************** -- * -- * Module Name: acpinames.h - Common include for AcpiNames utility -- * -- *****************************************************************************/ -- --/* -- * Copyright (C) 2000 - 2015, Intel Corp. -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions, and the following disclaimer, -- * without modification. -- * 2. Redistributions in binary form must reproduce at minimum a disclaimer -- * substantially similar to the "NO WARRANTY" disclaimer below -- * ("Disclaimer") and any redistribution must be conditioned upon -- * including a substantially similar Disclaimer requirement for further -- * binary redistribution. -- * 3. Neither the names of the above-listed copyright holders nor the names -- * of any contributors may be used to endorse or promote products derived -- * from this software without specific prior written permission. -- * -- * Alternatively, this software may be distributed under the terms of the -- * GNU General Public License ("GPL") version 2 as published by the Free -- * Software Foundation. -- * -- * NO WARRANTY -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR -- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -- * POSSIBILITY OF SUCH DAMAGES. -- */ -- --#ifndef _ACPINAMES_H --#define _ACPINAMES_H -- --#include "acpi.h" --#include "accommon.h" --#include "acapps.h" --#include "acutils.h" --#include "../acpiexec/aecommon.h" -- --#include -- --#define ACPI_MAX_INIT_TABLES (32) -- --extern BOOLEAN AcpiGbl_NsLoadOnly; --#endif diff --git a/debian/patches/series b/debian/patches/series index 9be3f55..0fe4204 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,5 +7,5 @@ name-miscompare.patch asllookup-miscompare.patch re-enable-big-endian.patch OPT_LDFLAGS.patch -rename-file.patch asllookup-ppc64.patch +template.patch diff --git a/debian/patches/template.patch b/debian/patches/template.patch new file mode 100644 index 0000000..4d2b69a --- /dev/null +++ b/debian/patches/template.patch @@ -0,0 +1,13 @@ +Index: acpica-unix-20150930/tests/templates/Makefile +=================================================================== +--- acpica-unix-20150930.orig/tests/templates/Makefile ++++ acpica-unix-20150930/tests/templates/Makefile +@@ -2,7 +2,7 @@ + PROG= templates + + templates : +- sh templates.sh ++ sh templates.sh 1 + + clean : + rm -f *.asl *.aml *.dsl *.hex diff.log