Refresh patches, add newer patch from Debian packages

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2017-11-20 18:33:29 -07:00
parent 0560f83293
commit 9b3daa9ea7
6 changed files with 279 additions and 252 deletions

2
.gitignore vendored
View File

@ -78,3 +78,5 @@
/acpitests-unix-20170831.tar.gz /acpitests-unix-20170831.tar.gz
/acpica-unix2-20170929.tar.gz /acpica-unix2-20170929.tar.gz
/acpitests-unix-20170929.tar.gz /acpitests-unix-20170929.tar.gz
/acpica-unix2-20171110.tar.gz
/acpitests-unix-20171110.tar.gz

View File

@ -1,5 +1,5 @@
Name: acpica-tools Name: acpica-tools
Version: 20170929 Version: 20171110
Release: 1%{?dist} Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables Summary: ACPICA tools for the development and debug of ACPI tables
@ -33,6 +33,7 @@ Patch6: free.patch
Patch7: ppc64le.patch Patch7: ppc64le.patch
Patch8: arm7hl.patch Patch8: arm7hl.patch
Patch9: big-endian-v2.patch Patch9: big-endian-v2.patch
Patch10: simple-64bit.patch
BuildRequires: bison patchutils flex BuildRequires: bison patchutils flex
@ -92,6 +93,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch7 -p1 -b .ppc64le %patch7 -p1 -b .ppc64le
%patch8 -p1 -b .arm7hl %patch8 -p1 -b .arm7hl
%patch9 -p1 -b .big-endian-v2 %patch9 -p1 -b .big-endian-v2
%patch10 -p1 -b .simple-64bit
cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1 cp -p %{SOURCE3} iasl.1
@ -186,6 +188,11 @@ fi
%changelog %changelog
* Mon Nov 20 2017 Al Stone <ahs3@redhat.com> - 20171110-1
- Update to 20171110 source tree, including patch refeshes
- Add patch for mips64el build, should it ever be needed; it also cleans
up all 64-bit arches, so nice to have regardless
* Fri Oct 6 2017 Al Stone <ahs3@redhat.com> - 20170929-1 * Fri Oct 6 2017 Al Stone <ahs3@redhat.com> - 20170929-1
- Update to 20170929 source tree, including patch refeshes - Update to 20170929 source tree, including patch refeshes
- Removed aslts-acpibin.patch to fix PATH problem in ASLTS; in upstream now - Removed aslts-acpibin.patch to fix PATH problem in ASLTS; in upstream now

File diff suppressed because it is too large Load Diff

View File

@ -24,10 +24,10 @@ From: Al Stone <ahs3@redhat.com>
source/tools/acpiexec/aemain.c | 2 +- source/tools/acpiexec/aemain.c | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-) 18 files changed, 28 insertions(+), 28 deletions(-)
Index: acpica-unix2-20170929/source/compiler/aslcompile.c Index: acpica-unix-20171110/source/compiler/aslcompile.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/compiler/aslcompile.c --- acpica-unix-20171110.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20170929/source/compiler/aslcompile.c +++ acpica-unix-20171110/source/compiler/aslcompile.c
@@ -750,7 +750,7 @@ CmCleanupAndExit ( @@ -750,7 +750,7 @@ CmCleanupAndExit (
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@ -37,10 +37,10 @@ Index: acpica-unix2-20170929/source/compiler/aslcompile.c
ASL_MAX_ERROR_COUNT); ASL_MAX_ERROR_COUNT);
} }
Index: acpica-unix2-20170929/source/compiler/aslerror.c Index: acpica-unix-20171110/source/compiler/aslerror.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/compiler/aslerror.c --- acpica-unix-20171110.orig/source/compiler/aslerror.c
+++ acpica-unix2-20170929/source/compiler/aslerror.c +++ acpica-unix-20171110/source/compiler/aslerror.c
@@ -873,7 +873,7 @@ AslLogNewError ( @@ -873,7 +873,7 @@ AslLogNewError (
Gbl_ExceptionCount[Level]++; Gbl_ExceptionCount[Level]++;
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@ -59,10 +59,10 @@ Index: acpica-unix2-20170929/source/compiler/aslerror.c
ASL_MAX_DISABLED_MESSAGES); ASL_MAX_DISABLED_MESSAGES);
return (AE_LIMIT); return (AE_LIMIT);
} }
Index: acpica-unix2-20170929/source/compiler/aslopt.c Index: acpica-unix-20171110/source/compiler/aslopt.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/compiler/aslopt.c --- acpica-unix-20171110.orig/source/compiler/aslopt.c
+++ acpica-unix2-20170929/source/compiler/aslopt.c +++ acpica-unix-20171110/source/compiler/aslopt.c
@@ -584,7 +584,7 @@ OptOptimizeNamePath ( @@ -584,7 +584,7 @@ OptOptimizeNamePath (
} }
@ -72,10 +72,10 @@ Index: acpica-unix2-20170929/source/compiler/aslopt.c
Op->Asl.LogicalLineNumber, Op->Asl.LogicalLineNumber,
AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
Index: acpica-unix2-20170929/source/compiler/aslpredef.c Index: acpica-unix-20171110/source/compiler/aslpredef.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/compiler/aslpredef.c --- acpica-unix-20171110.orig/source/compiler/aslpredef.c
+++ acpica-unix2-20170929/source/compiler/aslpredef.c +++ acpica-unix-20171110/source/compiler/aslpredef.c
@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumArguments != 0) if (MethodInfo->NumArguments != 0)
@ -85,10 +85,10 @@ Index: acpica-unix2-20170929/source/compiler/aslpredef.c
AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
MsgBuffer); MsgBuffer);
Index: acpica-unix2-20170929/source/compiler/aslprepkg.c Index: acpica-unix-20171110/source/compiler/aslprepkg.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/compiler/aslprepkg.c --- acpica-unix-20171110.orig/source/compiler/aslprepkg.c
+++ acpica-unix2-20170929/source/compiler/aslprepkg.c +++ acpica-unix-20171110/source/compiler/aslprepkg.c
@@ -309,7 +309,7 @@ ApCheckPackage ( @@ -309,7 +309,7 @@ ApCheckPackage (
if (Count & 1) if (Count & 1)
@ -98,11 +98,11 @@ Index: acpica-unix2-20170929/source/compiler/aslprepkg.c
Predefined->Info.Name, Count); Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
Index: acpica-unix2-20170929/source/components/debugger/dbexec.c Index: acpica-unix-20171110/source/components/debugger/dbexec.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/debugger/dbexec.c --- acpica-unix-20171110.orig/source/components/debugger/dbexec.c
+++ acpica-unix2-20170929/source/components/debugger/dbexec.c +++ acpica-unix-20171110/source/components/debugger/dbexec.c
@@ -226,7 +226,7 @@ AcpiDbExecuteMethod ( @@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Possible overflow of internal debugger " "Possible overflow of internal debugger "
"buffer (size 0x%X needed 0x%X)", "buffer (size 0x%X needed 0x%X)",
@ -111,10 +111,10 @@ Index: acpica-unix2-20170929/source/components/debugger/dbexec.c
} }
} }
Index: acpica-unix2-20170929/source/components/dispatcher/dsmthdat.c Index: acpica-unix-20171110/source/components/dispatcher/dsmthdat.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/dispatcher/dsmthdat.c --- acpica-unix-20171110.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix2-20170929/source/components/dispatcher/dsmthdat.c +++ acpica-unix-20171110/source/components/dispatcher/dsmthdat.c
@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode ( @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_LOCAL) if (Index > ACPI_METHOD_MAX_LOCAL)
{ {
@ -133,11 +133,11 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dsmthdat.c
Index, ACPI_METHOD_MAX_ARG)); Index, ACPI_METHOD_MAX_ARG));
return_ACPI_STATUS (AE_AML_INVALID_INDEX); return_ACPI_STATUS (AE_AML_INVALID_INDEX);
} }
Index: acpica-unix2-20170929/source/components/dispatcher/dsutils.c Index: acpica-unix-20171110/source/components/dispatcher/dsutils.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/dispatcher/dsutils.c --- acpica-unix-20171110.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix2-20170929/source/components/dispatcher/dsutils.c +++ acpica-unix-20171110/source/components/dispatcher/dsutils.c
@@ -787,7 +787,7 @@ AcpiDsCreateOperands ( @@ -788,7 +788,7 @@ AcpiDsCreateOperands (
} }
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
@ -146,10 +146,10 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dsutils.c
WalkState->NumOperands, ArgCount, Index)); WalkState->NumOperands, ArgCount, Index));
/* Create the interpreter arguments, in reverse order */ /* Create the interpreter arguments, in reverse order */
Index: acpica-unix2-20170929/source/components/dispatcher/dswscope.c Index: acpica-unix-20171110/source/components/dispatcher/dswscope.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/dispatcher/dswscope.c --- acpica-unix-20171110.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix2-20170929/source/components/dispatcher/dswscope.c +++ acpica-unix-20171110/source/components/dispatcher/dswscope.c
@@ -149,7 +149,7 @@ AcpiDsScopeStackPush ( @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
WalkState->ScopeDepth++; WalkState->ScopeDepth++;
@ -168,10 +168,10 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dswscope.c
(UINT32) WalkState->ScopeDepth, (UINT32) WalkState->ScopeDepth,
AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetNodeName (ScopeInfo->Scope.Node),
AcpiUtGetTypeName (ScopeInfo->Common.Value))); AcpiUtGetTypeName (ScopeInfo->Common.Value)));
Index: acpica-unix2-20170929/source/components/events/evgpe.c Index: acpica-unix-20171110/source/components/events/evgpe.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/events/evgpe.c --- acpica-unix-20171110.orig/source/components/events/evgpe.c
+++ acpica-unix2-20170929/source/components/events/evgpe.c +++ acpica-unix-20171110/source/components/events/evgpe.c
@@ -494,7 +494,7 @@ AcpiEvGpeDetect ( @@ -494,7 +494,7 @@ AcpiEvGpeDetect (
"Ignore disabled registers for GPE %02X-%02X: " "Ignore disabled registers for GPE %02X-%02X: "
"RunEnable=%02X, WakeEnable=%02X\n", "RunEnable=%02X, WakeEnable=%02X\n",
@ -190,10 +190,10 @@ Index: acpica-unix2-20170929/source/components/events/evgpe.c
(UINT32) StatusReg, (UINT32) EnableReg, (UINT32) StatusReg, (UINT32) EnableReg,
GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake)); GpeRegisterInfo->EnableForWake));
Index: acpica-unix2-20170929/source/components/executer/exdump.c Index: acpica-unix-20171110/source/components/executer/exdump.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/executer/exdump.c --- acpica-unix-20171110.orig/source/components/executer/exdump.c
+++ acpica-unix2-20170929/source/components/executer/exdump.c +++ acpica-unix-20171110/source/components/executer/exdump.c
@@ -678,7 +678,7 @@ AcpiExDumpOperand ( @@ -678,7 +678,7 @@ AcpiExDumpOperand (
if (Depth > 0) if (Depth > 0)
{ {
@ -203,10 +203,10 @@ Index: acpica-unix2-20170929/source/components/executer/exdump.c
} }
else else
{ {
Index: acpica-unix2-20170929/source/components/executer/exfldio.c Index: acpica-unix-20171110/source/components/executer/exfldio.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/executer/exfldio.c --- acpica-unix-20171110.orig/source/components/executer/exfldio.c
+++ acpica-unix2-20170929/source/components/executer/exfldio.c +++ acpica-unix-20171110/source/components/executer/exfldio.c
@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule ( @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -218,10 +218,10 @@ Index: acpica-unix2-20170929/source/components/executer/exfldio.c
return_ACPI_STATUS (AE_AML_OPERAND_VALUE); return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
} }
} }
Index: acpica-unix2-20170929/source/components/executer/exnames.c Index: acpica-unix-20171110/source/components/executer/exnames.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/executer/exnames.c --- acpica-unix-20171110.orig/source/components/executer/exnames.c
+++ acpica-unix2-20170929/source/components/executer/exnames.c +++ acpica-unix-20171110/source/components/executer/exnames.c
@@ -240,7 +240,7 @@ AcpiExNameSegment ( @@ -240,7 +240,7 @@ AcpiExNameSegment (
*/ */
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@ -240,10 +240,10 @@ Index: acpica-unix2-20170929/source/components/executer/exnames.c
} }
*InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
Index: acpica-unix2-20170929/source/components/hardware/hwregs.c Index: acpica-unix-20171110/source/components/hardware/hwregs.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/hardware/hwregs.c --- acpica-unix-20171110.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20170929/source/components/hardware/hwregs.c +++ acpica-unix-20171110/source/components/hardware/hwregs.c
@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus ( @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
@ -253,10 +253,10 @@ Index: acpica-unix2-20170929/source/components/hardware/hwregs.c
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
Index: acpica-unix2-20170929/source/components/tables/tbfadt.c Index: acpica-unix-20171110/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/tables/tbfadt.c --- acpica-unix-20171110.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20170929/source/components/tables/tbfadt.c +++ acpica-unix-20171110/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
if (!(Flags & ACPI_FADT_GPE_REGISTER)) if (!(Flags & ACPI_FADT_GPE_REGISTER))
{ {
@ -284,10 +284,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbfadt.c
Name, Address32, Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address), ACPI_FORMAT_UINT64 (Address64->Address),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Index: acpica-unix2-20170929/source/components/tables/tbxfroot.c Index: acpica-unix-20171110/source/components/tables/tbxfroot.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/tables/tbxfroot.c --- acpica-unix-20171110.orig/source/components/tables/tbxfroot.c
+++ acpica-unix2-20170929/source/components/tables/tbxfroot.c +++ acpica-unix-20171110/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ AcpiFindRootPointer ( @@ -177,7 +177,7 @@ AcpiFindRootPointer (
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -315,10 +315,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbxfroot.c
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
Index: acpica-unix2-20170929/source/components/utilities/utownerid.c Index: acpica-unix-20171110/source/components/utilities/utownerid.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/components/utilities/utownerid.c --- acpica-unix-20171110.orig/source/components/utilities/utownerid.c
+++ acpica-unix2-20170929/source/components/utilities/utownerid.c +++ acpica-unix-20171110/source/components/utilities/utownerid.c
@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId ( @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
else else
{ {
@ -328,10 +328,10 @@ Index: acpica-unix2-20170929/source/components/utilities/utownerid.c
} }
(void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
Index: acpica-unix2-20170929/source/tools/acpiexec/aemain.c Index: acpica-unix-20171110/source/tools/acpiexec/aemain.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/tools/acpiexec/aemain.c --- acpica-unix-20171110.orig/source/tools/acpiexec/aemain.c
+++ acpica-unix2-20170929/source/tools/acpiexec/aemain.c +++ acpica-unix-20171110/source/tools/acpiexec/aemain.c
@@ -205,7 +205,7 @@ AeDoOptions ( @@ -205,7 +205,7 @@ AeDoOptions (
if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1))

18
simple-64bit.patch Normal file
View File

@ -0,0 +1,18 @@
Description: Stop listing all 64bit architectures
Check __LP64__ instead of maintaining a list of all
64bit architectures.
Author: Adrian Bunk <bunk@debian.org>
--- acpica-unix-20170831.orig/source/include/platform/aclinux.h
+++ acpica-unix-20170831/source/include/platform/aclinux.h
@@ -208,9 +208,7 @@
#define ACPI_FLUSH_CPU_CACHE()
#define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
-#if defined(__ia64__) || defined(__x86_64__) ||\
- defined(__aarch64__) || defined(__PPC64__) ||\
- defined(__s390x__)
+#if defined(__LP64__)
#define ACPI_MACHINE_WIDTH 64
#define COMPILER_DEPENDENT_INT64 long
#define COMPILER_DEPENDENT_UINT64 unsigned long

View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20170929.tar.gz) = 038c4cb600c2a28c8099909278d21c00144026239e7f67f8e0e6714bccf2344d16acd69a415afeaa41ee6d1970d377db729564757516c1972a283afe6c3bca23 SHA512 (acpica-unix2-20171110.tar.gz) = e7add3a1a41894c997f4f71f9f4c1b889b246912f4c5525a6d99b37b099773b3840ebe9d1e050bdb0dbda9b0d784105247dcbb6e1b85801522db2ee1370f9962
SHA512 (acpitests-unix-20170929.tar.gz) = 0cac16f172ffe1f46aceee8e23d7b7f7f7f220e88f027d83d68ab8db0709eb2fef971a13606ee7969f8bb7b8e512ec44637b750dc7a5616a7c1665698807b1e8 SHA512 (acpitests-unix-20171110.tar.gz) = 8d7842c431890541ae9ad7270020a995e09b80fdcd7528e534f9ad876ffa1f1b9a39452bca6747cc1a5b749a752d785c8bfedafbe9af29b28d1af3db079fb3d4