SHA256
1
0
forked from pool/acpica

- Updated to acpica version 20110316

Changes are listed in /usr/share/doc/packages/acpica/changes.txt
- Fixed dynamic acpi table extract via acpidump/acpixtract
  by reverting acpica commit baab09e6857a427944068c5e599ea2ffb84f765b
- Fixed compile issue and submitted it mainline

OBS-URL: https://build.opensuse.org/package/show/hardware/acpica?expand=0&rev=24
This commit is contained in:
2011-03-30 15:53:19 +00:00
committed by Git OBS Bridge
parent 2431d9e89e
commit 9c65b229c7
8 changed files with 97 additions and 8 deletions

View File

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

View File

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

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Mar 30 15:50:47 UTC 2011 - trenn@suse.de
- Updated to acpica version 20110316
Changes are listed in /usr/share/doc/packages/acpica/changes.txt
- Fixed dynamic acpi table extract via acpidump/acpixtract
by reverting acpica commit baab09e6857a427944068c5e599ea2ffb84f765b
- Fixed compile issue and submitted it mainline
-------------------------------------------------------------------
Thu Feb 24 15:31:07 UTC 2011 - trenn@novell.com

View File

@@ -20,16 +20,18 @@
Name: acpica
Url: http://acpica.org
Version: 20110112
Version: 20110316
Release: 6
License: Intel ACPICA
%define src_dir acpica-unix-%{version}
%define dmp_ver 20101221
%define dmp_ver 20110323
Group: Development/Tools/Debuggers
Summary: This is a set of tools to display and debug your BIOS ACPI tables
Source: %{src_dir}.tar.bz2
Patch1: acpica-override-CFLAGS.diff
Patch2: acpidump-override-CFLAGS.patch
Patch3: acpiexec_fix_build_missing_utdecode.patch
Patch4: acpica_fix_acpixtract
Source1: ec_access.c
Source2: acpidump-%{dmp_ver}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -61,6 +63,8 @@ Authors:
%setup -n %{src_dir} -a 2
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"

54
acpica_fix_acpixtract Normal file
View File

@@ -0,0 +1,54 @@
acpica: Revert commit baab09e6857a427944068c5e599ea2ffb84f765b
to fix dynamic SSDT table extract.
Signed-off-by: Thomas Renninger <trenn@suse.de>
Index: source/tools/acpixtract/acpixtract.c
===================================================================
--- source.orig/tools/acpixtract/acpixtract.c
+++ source/tools/acpixtract/acpixtract.c
@@ -122,11 +122,11 @@
/* Note: This is a 32-bit program only */
-#define VERSION 0x20110225
+#define VERSION 0x20100107
#define FIND_HEADER 0
#define EXTRACT_DATA 1
#define BUFFER_SIZE 256
-#define HEADER_LINE_LENGTH 17 /* strlen ("FACP @ 0x737e1000") */
+
/* Local prototypes */
@@ -577,13 +577,6 @@ ExtractTables (
{
case FIND_HEADER:
- /* Ignore lines that are too short to be header lines */
-
- if (strlen (Buffer) < HEADER_LINE_LENGTH)
- {
- continue;
- }
-
/* Ignore empty lines and lines that start with a space */
if ((Buffer[0] == ' ') ||
@@ -591,15 +584,6 @@ ExtractTables (
{
continue;
}
-
- /* Ignore lines that are not of the form "ABCD @ " */
-
- if ((Buffer[4] != ' ') ||
- (Buffer[5] != '@') ||
- (Buffer[6] != ' '))
- {
- continue;
- }
NormalizeSignature (Buffer);
strncpy (ThisSignature, Buffer, 4);

View File

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

View File

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

View File

@@ -0,0 +1,22 @@
acpica: fix build
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
tools/acpiexec/Makefile | 3 +++
1 file changed, 3 insertions(+)
Index: acpica-unix-20110316/tools/acpiexec/Makefile
===================================================================
--- acpica-unix-20110316.orig/tools/acpiexec/Makefile
+++ acpica-unix-20110316/tools/acpiexec/Makefile
@@ -591,6 +591,9 @@ utdebug.o : $(ACPICA_CORE)/utili
utdebug.o : $(ACPICA_CORE)/utilities/utdebug.c
$(COMPILE)
+utdecode.o : $(ACPICA_CORE)/utilities/utdecode.c
+ $(COMPILE)
+
utdelete.o : $(ACPICA_CORE)/utilities/utdelete.c
$(COMPILE)