rpm/acpica
SHA256
1
0
Fork 0
forked from pool/acpica
Code Pull Requests Activity

- ACPICA version 20111123 released with full ACPI 5.0 support

Browse Source 
Detailed changelog can be found here:
  http://acpica.org/download/changes.txt

OBS-URL: https://build.opensuse.org/package/show/hardware/acpica?expand=0&rev=34
This commit is contained in:
Thomas Renninger 2011-11-24 17:35:15 +00:00 committed by Git OBS Bridge
parent 066d571d79
commit 0d69bcbb46
8 changed files with 81 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
acpica-no-compiletime.patch
View File

@ -1,8 +1,29 @@
---
compiler/aslcompile.c | 9 ++-------
compiler/aslutils.c | 4 ++--
include/acapps.h | 8 ++++----
3 files changed, 8 insertions(+), 13 deletions(-)
Index: compiler/aslcompile.c
===================================================================
--- compiler/aslcompile.c.orig
+++ compiler/aslcompile.c
@@ -274,8 +274,8 @@ AslCompilerFileHeader (
NewTime = localtime (&Aclock);
@@ -157,8 +157,6 @@ void
AslCompilerFileHeader (
UINT32 FileId)
{
- struct tm *NewTime;
- time_t Aclock;
char *Prefix = "";
@@ -198,12 +196,9 @@ AslCompilerFileHeader (
/* Compilation header with timestamp */
- (void) time (&Aclock);
- NewTime = localtime (&Aclock);
-
FlPrintFile (FileId,
- "%sCompilation of \"%s\" - %s%s\n",
- Prefix, Gbl_Files[ASL_FILE_INPUT].Filename, asctime (NewTime),
@ -11,22 +32,26 @@
Prefix);
switch (FileId)
Index: compiler/aslutils.c
===================================================================
--- compiler/aslutils.c.orig
+++ compiler/aslutils.c
@@ -567,8 +567,8 @@ UtDisplaySummary (
@@ -478,8 +478,8 @@ UtDisplaySummary (
{
/* Compiler name and version number */
- FlPrintFile (FileId, "%s version %X%s [%s]\n",
- FlPrintFile (FileId, "%s version %X%s [%s]\n\n",
- ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_WIDTH, __DATE__);
+ FlPrintFile (FileId, "%s version %X%s\n",
+ FlPrintFile (FileId, "%s version %X%s\n\n",
+ ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_WIDTH);
}
if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_DATA)
/* Summary of main input and output files */
Index: include/acapps.h
===================================================================
--- include/acapps.h.orig
+++ include/acapps.h
@@ -141,15 +141,15 @@
@@ -69,15 +69,15 @@
/* Macros for signons and file headers */
#define ACPI_COMMON_SIGNON(UtilityName) \

50
acpica-override-CFLAGS.diff
View File

@ -9,52 +9,52 @@ From: Thomas Renninger <trenn@suse.de>
tools/acpixtract/Makefile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Index: acpica-unix-20110623/compiler/Makefile
Index: acpica-unix2-20111123/compiler/Makefile
===================================================================
--- acpica-unix-20110623.orig/compiler/Makefile
+++ acpica-unix-20110623/compiler/Makefile
@@ -31,7 +31,7 @@ ASL_COMPILER = $(ACPICA_SRC)/compiler
INSTALLDIR = /usr/bin
INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR)
--- acpica-unix2-20111123.orig/compiler/Makefile
+++ acpica-unix2-20111123/compiler/Makefile
@@ -217,7 +217,7 @@ MISC = \
dtparser.y.h \
dtparserparse.output
-CFLAGS+= \
+override CFLAGS+= \
-D$(HOST) \
-D_GNU_SOURCE \
-DACPI_ASL_COMPILER \
Index: acpica-unix-20110623/tools/acpiexec/Makefile
Index: acpica-unix2-20111123/tools/acpiexec/Makefile
===================================================================
--- acpica-unix-20110623.orig/tools/acpiexec/Makefile
+++ acpica-unix-20110623/tools/acpiexec/Makefile
@@ -33,7 +33,7 @@ ACPICA_OSL = $(ACPICA_SRC)/os_specifi
INSTALLDIR = /usr/bin
INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR)
--- acpica-unix2-20111123.orig/tools/acpiexec/Makefile
+++ acpica-unix2-20111123/tools/acpiexec/Makefile
@@ -229,7 +229,7 @@ OBJECTS = \
utxface.o \
utxfmutex.o
-CFLAGS+= \
+override CFLAGS+= \
-D$(HOST) \
-D_GNU_SOURCE \
-DACPI_EXEC_APP \
Index: acpica-unix-20110623/tools/acpixtract/Makefile
Index: acpica-unix2-20111123/tools/acpixtract/Makefile
===================================================================
--- acpica-unix-20110623.orig/tools/acpixtract/Makefile
+++ acpica-unix-20110623/tools/acpixtract/Makefile
@@ -30,7 +30,7 @@ ACPICA_OSL = $(ACPICA_SRC)/os_specifi
INSTALLDIR = /usr/bin
INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR)
--- acpica-unix2-20111123.orig/tools/acpixtract/Makefile
+++ acpica-unix2-20111123/tools/acpixtract/Makefile
@@ -50,7 +50,7 @@ OBJECTS = \
axmain.o \
getopt.o
-CFLAGS+= \
+override CFLAGS+= \
-D$(HOST) \
-D_GNU_SOURCE \
-I$(ACPICA_SRC)/include
Index: acpica-unix-20110623/tools/acpisrc/Makefile
-DACPI_XTRACT_APP \
Index: acpica-unix2-20111123/tools/acpisrc/Makefile
===================================================================
--- acpica-unix-20110623.orig/tools/acpisrc/Makefile
+++ acpica-unix-20110623/tools/acpisrc/Makefile
@@ -30,7 +30,7 @@ ACPICA_OSL = $(ACPICA_SRC)/os_specifi
INSTALLDIR = /usr/bin
INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR)
--- acpica-unix2-20111123.orig/tools/acpisrc/Makefile
+++ acpica-unix2-20111123/tools/acpisrc/Makefile
@@ -58,7 +58,7 @@ OBJECTS = \
osunixdir.o \
getopt.o
-CFLAGS+= \
+override CFLAGS+= \

3
acpica-unix-20110623.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d60070f072919b2b6a6fc01bed4207b07b26060ecea58bab29690dba8e659428
size 796726

3
acpica-unix2-20111123.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e14f3842215bc9bcd389070709c3c6d2e4f46912c0ee08274bfc0dc0ce240ad8
size 787811

7
acpica.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 24 16:33:44 UTC 2011 - trenn@suse.de
- ACPICA version 20111123 released with full ACPI 5.0 support
Detailed changelog can be found here:
http://acpica.org/download/changes.txt
-------------------------------------------------------------------
Wed Jun 29 19:40:28 UTC 2011 - trenn@suse.de

11
acpica.spec
View File

@ -20,10 +20,10 @@
Name: acpica
Url: http://acpica.org
Version: 20110623
Version: 20111123
Release: 6
License: Intel ACPICA
%define src_dir acpica-unix-%{version}
%define src_dir acpica-unix2-%{version}
%define dmp_ver 20110323
Group: Development/Tools/Debuggers
Summary: This is a set of tools to display and debug your BIOS ACPI tables
@ -31,9 +31,8 @@ Source: %{src_dir}.tar.bz2
Patch1: acpica-override-CFLAGS.diff
Patch2: acpidump-override-CFLAGS.patch
Patch3: acpica-no-compiletime.patch
Patch4: acpica_unused_compile_fix.patch
Patch5: acpica_fix_link_order.patch
Patch6: acpica_fix_32bit_build.patch
Patch4: acpica_fix_link_order.patch
Patch5: acpica_fix_32bit_build.patch
Source1: ec_access.c
Source2: acpidump-%{dmp_ver}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -69,7 +68,6 @@ Authors:
%patch3
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@ -94,7 +92,6 @@ install -Dm 755 tools/acpixtract/acpixtract %{buildroot}/usr/bin/acpixtract
install -Dm 644 README %{buildroot}/%{_docdir}/%{name}/README
install -Dm 644 changes.txt %{buildroot}/%{_docdir}/%{name}/changes.txt
%files
%defattr(-,root,root)
#/usr/sbin/acpidump

20
acpica_fix_link_order.patch
View File

@ -2,16 +2,16 @@
tools/acpiexec/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: acpica-unix-20110623/tools/acpiexec/Makefile
Index: acpica-unix2-20111123/tools/acpiexec/Makefile
===================================================================
--- acpica-unix-20110623.orig/tools/acpiexec/Makefile
+++ acpica-unix-20110623/tools/acpiexec/Makefile
@@ -212,7 +212,7 @@ OBJS = \
# Root rule
--- acpica-unix2-20111123.orig/tools/acpiexec/Makefile
+++ acpica-unix2-20111123/tools/acpiexec/Makefile
@@ -272,7 +272,7 @@ CWARNINGFLAGS += \
# Rules
#
$(PROG) : $(OBJS)
- $(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
+ $(CC) $(OBJS) $(LDFLAGS) -o $(PROG)
$(PROG) : $(OBJECTS)
- $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
+ $(CC) $(OBJECTS) $(LDFLAGS) -o $(PROG)
$(COPYPROG)
#
# acpiexec source
%.o : %.c $(HEADERS) $(ACPICA_HEADERS)

114
acpica_unused_compile_fix.patch
View File

@ -1,114 +0,0 @@
---
compiler/aslcompile.c | 2 --
compiler/aslcompiler.l | 3 ---
os_specific/service_layers/osunixxf.c | 5 ++---
tools/acpisrc/asconvrt.c | 4 ----
4 files changed, 2 insertions(+), 12 deletions(-)
Index: acpica-unix-20110623/compiler/aslcompiler.l
===================================================================
--- acpica-unix-20110623.orig/compiler/aslcompiler.l
+++ acpica-unix-20110623/compiler/aslcompiler.l
@@ -550,8 +550,6 @@ AslPopInputFileStack (
void)
{
ASL_FILE_NODE *Fnode;
- FILE *InputFile = NULL;
-
Fnode = InputStack;
DbgPrint (ASL_PARSE_OUTPUT, "\nPop InputFile Stack, Fnode %p\n\n", Fnode);
@@ -569,7 +567,6 @@ AslPopInputFileStack (
/* Update the top-of-stack */
InputStack = Fnode->Next;
- InputFile = Fnode->File;
/* Reset global line counter and filename */
Index: acpica-unix-20110623/compiler/aslcompile.c
===================================================================
--- acpica-unix-20110623.orig/compiler/aslcompile.c
+++ acpica-unix-20110623/compiler/aslcompile.c
@@ -229,7 +229,6 @@ void
AslCompilerFileHeader (
UINT32 FileId)
{
- struct tm *NewTime;
time_t Aclock;
char *Prefix = "";
@@ -271,7 +270,6 @@ AslCompilerFileHeader (
/* Compilation header with timestamp */
(void) time (&Aclock);
- NewTime = localtime (&Aclock);
FlPrintFile (FileId,
"%sCompilation of \"%s\"\n",
Index: acpica-unix-20110623/os_specific/service_layers/osunixxf.c
===================================================================
--- acpica-unix-20110623.orig/os_specific/service_layers/osunixxf.c
+++ acpica-unix-20110623/os_specific/service_layers/osunixxf.c
@@ -349,7 +349,6 @@ AcpiOsVprintf (
const char *Fmt,
va_list Args)
{
- INT32 Count = 0;
UINT8 Flags;
@@ -362,7 +361,7 @@ AcpiOsVprintf (
{
/* Output file is open, send the output there */
- Count = vfprintf (AcpiGbl_DebugFile, Fmt, Args);
+ vfprintf (AcpiGbl_DebugFile, Fmt, Args);
}
else
{
@@ -374,7 +373,7 @@ AcpiOsVprintf (
if (Flags & ACPI_DB_CONSOLE_OUTPUT)
{
- Count = vfprintf (AcpiGbl_OutputFile, Fmt, Args);
+ vfprintf (AcpiGbl_OutputFile, Fmt, Args);
}
}
Index: acpica-unix-20110623/tools/acpisrc/asconvrt.c
===================================================================
--- acpica-unix-20110623.orig/tools/acpisrc/asconvrt.c
+++ acpica-unix-20110623/tools/acpisrc/asconvrt.c
@@ -649,7 +649,6 @@ void
AsBracesOnSameLine (
char *Buffer)
{
- UINT32 Length;
char *SubBuffer = Buffer;
char *Beginning;
char *StartOfThisLine;
@@ -741,7 +740,6 @@ AsBracesOnSameLine (
{
Beginning++;
SubBuffer++;
- Length = strlen (SubBuffer);
Gbl_MadeChanges = TRUE;
@@ -1315,7 +1313,6 @@ AsInsertPrefix (
char *SubString;
char *SubBuffer;
char *EndKeyword;
- int StrLength;
int InsertLength;
char *InsertString;
int TrailingSpaces;
@@ -1392,7 +1389,6 @@ AsInsertPrefix (
/* Prefix the keyword with the insert string */
Gbl_MadeChanges = TRUE;
- StrLength = strlen (SubString);
/* Is there room for insertion */