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

Updating link to change in openSUSE:Factory/acpica revision 9.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/hardware/acpica?expand=0&rev=7ca9d60dbe0f03d72004efc1885252cd
This commit is contained in:
OBS User buildservice-autocommit
2010-09-21 11:05:46 +00:00
committed by Git OBS Bridge
parent a78039d02a
commit 74e912f6ac
6 changed files with 54 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
acpica-override-CFLAGS.diff
View File

@@ -5,40 +5,40 @@ From: Thomas Renninger <trenn@suse.de>
---
compiler/Makefile | 2 +-
tools/acpiexec/Makefile | 2 +-
tools/acpisrc/Makefile | 4 ++--
tools/acpisrc/Makefile | 2 +-
tools/acpixtract/Makefile | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
4 files changed, 4 insertions(+), 4 deletions(-)
Index: acpica-unix-20090320/compiler/Makefile
Index: acpica-unix-20100806/compiler/Makefile
===================================================================
--- acpica-unix-20090320.orig/compiler/Makefile
+++ acpica-unix-20090320/compiler/Makefile
@@ -92,7 +92,7 @@ SRCS= aslcompilerparse.c aslcompilerlex.
../osunixxf.c
--- acpica-unix-20100806.orig/compiler/Makefile
+++ acpica-unix-20100806/compiler/Makefile
@@ -12,7 +12,7 @@ ACPICA_TOOLS = $(ACPICA_SRC)/tools
ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers
NOMAN= YES
-CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include
+override CFLAGS+= -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include
-CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include -I../compiler
+override CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include -I../compiler
#YACC= yacc
YACC= bison
Index: acpica-unix-20090320/tools/acpiexec/Makefile
#
# Bison/Flex configuration
Index: acpica-unix-20100806/tools/acpiexec/Makefile
===================================================================
--- acpica-unix-20090320.orig/tools/acpiexec/Makefile
+++ acpica-unix-20090320/tools/acpiexec/Makefile
@@ -133,7 +133,7 @@ SRCS= aetables.c aehandlers.c aeexec.c a
../../osunixxf.c
--- acpica-unix-20100806.orig/tools/acpiexec/Makefile
+++ acpica-unix-20100806/tools/acpiexec/Makefile
@@ -11,7 +11,7 @@ ACPICA_TOOLS = $(ACPICA_SRC)/tools
ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers
NOMAN= YES
-CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I$(ACPICA_SRC)/include
+override CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I$(ACPICA_SRC)/include
-CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../include
+override CFLAGS+= -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../include
acpiexec : $(patsubst %.c,%.o, $(SRCS))
Index: acpica-unix-20090320/tools/acpixtract/Makefile
COMPILE = $(CC) -c $(CFLAGS) -o$@ $?
LDFLAGS += -lpthread -lrt
Index: acpica-unix-20100806/tools/acpixtract/Makefile
===================================================================
--- acpica-unix-20090320.orig/tools/acpixtract/Makefile
+++ acpica-unix-20090320/tools/acpixtract/Makefile
--- acpica-unix-20100806.orig/tools/acpixtract/Makefile
+++ acpica-unix-20100806/tools/acpixtract/Makefile
@@ -3,7 +3,7 @@
PROG= acpixtract
SRCS= acpixtract.c
@@ -48,21 +48,16 @@ Index: acpica-unix-20090320/tools/acpixtract/Makefile
acpixtract : $(patsubst %.c,%.o, $(SRCS))
Index: acpica-unix-20090320/tools/acpisrc/Makefile
Index: acpica-unix-20100806/tools/acpisrc/Makefile
===================================================================
--- acpica-unix-20090320.orig/tools/acpisrc/Makefile
+++ acpica-unix-20090320/tools/acpisrc/Makefile
@@ -4,11 +4,11 @@ PROG= acpisrc
--- acpica-unix-20100806.orig/tools/acpisrc/Makefile
+++ acpica-unix-20100806/tools/acpisrc/Makefile
@@ -4,7 +4,7 @@ PROG= acpisrc
SRCS= ascase.c asconvrt.c asfile.c asmain.c asremove.c astable.c \
asutils.c osunixdir.c ../../common/getopt.c
-CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include
+override CFLAGS+= -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include
+override CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include
aslmain : $(patsubst %.c,%.o, $(SRCS))
- $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
+ $(CC) $(LDFLAGS) $(CFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
CLEANFILES= $(PROG)

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

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

3
acpica-unix-20100806.tar.bz2 Normal file
View File

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

19
acpica.changes
View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sat Aug 7 06:39:44 UTC 2010 - trenn@novell.com
- Update to version 20100806
For details, see the changes.txt file in the package
changes.txt can now be found in
/usr/share/doc/packages/acpica/changes.txt
-------------------------------------------------------------------
Sun Jul 4 18:31:49 UTC 2010 - trenn@novell.com
- Update to version 20100702
For details, see acpica-unix-20100702/changes.txt
-------------------------------------------------------------------
Thu Apr 29 12:05:18 UTC 2010 - trenn@novell.com
- Update to version 20100428
-------------------------------------------------------------------
Mon Mar 8 13:56:19 UTC 2010 - trenn@novell.com

7
acpica.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package acpica (Version 20100304)
# spec file for package acpica (Version 20100806)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: acpica
Url: http://acpica.org
Version: 20100304
Version: 20100806
Release: 1
License: Intel ACPICA
%define src_dir acpica-unix-%{version}
@@ -32,7 +32,6 @@ Patch2: acpidump-override-CFLAGS.patch
Patch3: unaligned_acpidump.patch
Patch4: acpidump-cleanup.diff
Patch5: acpidump_adjust_to_new_acpica_headers.patch
Patch6: acpica_fix_integer_predefines.patch
Source2: acpidump.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64
@@ -66,7 +65,6 @@ Authors:
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g"
@@ -89,6 +87,7 @@ install -Dm 755 tools/acpisrc/acpisrc %{buildroot}/usr/sbin/acpisrc
install -Dm 755 tools/acpiexec/acpiexec %{buildroot}/usr/bin/acpiexec
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)

22
acpica_fix_integer_predefines.patch
View File

@@ -1,22 +0,0 @@
From: Lin Ming <ming.m.lin@intel.com>
Avoid (when compiling AML):
DSDT.dsl 10307: Name (_ADR, Zero)
Error 4080 - ^ Invalid object type for reserved name,
must be (Integer)
Which is not an error
diff --git a/compiler/aslpredef.c b/compiler/aslpredef.c
index 04cd2d4..30d33d5 100644
--- a/compiler/aslpredef.c
+++ b/compiler/aslpredef.c
@@ -535,6 +535,9 @@ ApCheckObjectType (
switch (Op->Asl.ParseOpcode)
{
case PARSEOP_INTEGER:
+ case PARSEOP_ZERO:
+ case PARSEOP_ONE:
+ case PARSEOP_ONES:
ReturnBtype = ACPI_RTYPE_INTEGER;
break;