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

- Update to version 20130517

Browse Source 
- remove acpidump tarball, it is now included in acpica main project

OBS-URL: https://build.opensuse.org/package/show/hardware/acpica?expand=0&rev=53
This commit is contained in:
Thomas Renninger
2013-05-24 13:28:18 +00:00
committed by Git OBS Bridge
parent 136e164d59
commit 6504fdc42b
8 changed files with 54 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acpica-unix2-20130418.tar.bz2
View File

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

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

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

6
acpica.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 24 13:27:25 UTC 2013 - trenn@suse.de
- Update to version 20130517
- remove acpidump tarball, it is now included in acpica main project
-------------------------------------------------------------------
Fri May 17 10:11:01 UTC 2013 - trenn@suse.de

24
acpica.spec
View File

@@ -20,7 +20,7 @@
Name: acpica
Url: http://acpica.org
Version: 20130418
Version: 20130517
Release: 6
License: GPL-2.0
%define src_dir acpica-unix2-%{version}
@@ -28,15 +28,13 @@ License: GPL-2.0
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: acpidump-override-CFLAGS.patch
Patch2: acpica-no-compiletime.patch
Patch3: wmidump_add_she_bang.patch
Patch4: dmar-buf10.patch
Patch1: acpica-no-compiletime.patch
Patch2: wmidump_add_she_bang.patch
Patch3: dmar-buf10.patch
Source1: ec_access.c
Source2: acpidump-%{dmp_ver}.tar.bz2
Source3: acpi_genl.tar.bz2
Source4: acpi_validate
Source5: wmidump.tar.bz2
Source2: acpi_genl.tar.bz2
Source3: acpi_validate
Source4: wmidump.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64
BuildRequires: bison flex glibc-devel
@@ -64,15 +62,13 @@ Authors:
and other Intel people
%prep
%setup -n %{src_dir} -a 2 -a 3 -a 5
%setup -n %{src_dir} -a 2 -a 4
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
cc %{SOURCE1} $RPM_OPT_FLAGS -o ec_access
make -C acpidump CFLAGS="$RPM_OPT_FLAGS"
make -C acpi_genl CFLAGS="$RPM_OPT_FLAGS"
make -C wmidump CFLAGS="$RPM_OPT_FLAGS"
make OPT_CFLAGS="$RPM_OPT_FLAGS"
@@ -81,8 +77,6 @@ make OPT_CFLAGS="$RPM_OPT_FLAGS"
install -Dm 755 %{SOURCE4} %{buildroot}/usr/bin/acpi_validate
install -Dm 755 ec_access %{buildroot}/usr/sbin/ec_access
install -Dm 755 acpidump/acpidump %{buildroot}/usr/sbin/acpidump
install -Dm 755 wmidump/wmidump %{buildroot}/usr/bin/wmidump
install -Dm 755 wmidump/wmixtract.py %{buildroot}/usr/bin/wmixtract
install -Dm 644 wmidump/README %{buildroot}/%{_docdir}/%{name}/README_wmidump
@@ -101,7 +95,7 @@ make install DESTDIR="%{buildroot}"
/usr/bin/acpisrc
/usr/bin/wmidump
/usr/bin/wmixtract
/usr/sbin/acpidump
/usr/bin/acpidump
/usr/sbin/acpi_genl
/usr/sbin/ec_access
/usr/bin/acpibin

3
acpidump-20110323.tar.bz2
View File

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

21
acpidump-override-CFLAGS.patch
View File

@@ -1,21 +0,0 @@
Make it possible to extend CFLAGS when invoking make
From: Thomas Renninger <trenn@suse.de>
---
acpidump/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: acpica-unix-20110413/acpidump/Makefile
===================================================================
--- acpica-unix-20110413.orig/acpidump/Makefile
+++ acpica-unix-20110413/acpidump/Makefile
@@ -1,7 +1,7 @@
PROG= acpidump
SRCS= acpidump.c
KERNEL_INCLUDE := ../include
-CFLAGS += -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
+override CFLAGS += -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
all: acpidump
$(PROG) : $(SRCS)

65
dmar-buf10.patch
View File

@@ -1,30 +1,31 @@
Index: acpica/source/common/dmtable.c
Index: acpica-unix2-20130517/source/common/dmtable.c
===================================================================
--- acpica.orig/source/common/dmtable.c
+++ acpica/source/common/dmtable.c
@@ -800,6 +800,9 @@ AcpiDmDumpTable (
case ACPI_DMT_NAME8:
--- acpica-unix2-20130517.orig/source/common/dmtable.c
+++ acpica-unix2-20130517/source/common/dmtable.c
@@ -744,6 +744,10 @@ AcpiDmDumpTable (
ByteLength = 8;
break;
+ case ACPI_DMT_BUF10:
+ ByteLength = 10;
+ break;
+ ByteLength = 10;
+ break;
+
case ACPI_DMT_BUF16:
case ACPI_DMT_UUID:
ByteLength = 16;
@@ -907,6 +910,7 @@ AcpiDmDumpTable (
@@ -862,6 +866,7 @@ AcpiDmDumpTable (
break;
case ACPI_DMT_BUF7:
+ case ACPI_DMT_BUF10:
case ACPI_DMT_BUF16:
case ACPI_DMT_BUF128:
Index: acpica/source/common/dmtbinfo.c
/*
Index: acpica-unix2-20130517/source/common/dmtbinfo.c
===================================================================
--- acpica.orig/source/common/dmtbinfo.c
+++ acpica/source/common/dmtbinfo.c
@@ -852,6 +852,7 @@ ACPI_DMTABLE_INFO AcpiDmTableI
--- acpica-unix2-20130517.orig/source/common/dmtbinfo.c
+++ acpica-unix2-20130517/source/common/dmtbinfo.c
@@ -780,6 +780,7 @@ ACPI_DMTABLE_INFO AcpiDmTableI
{
{ACPI_DMT_UINT8, ACPI_DMAR_OFFSET (Width), "Host Address Width", 0},
{ACPI_DMT_UINT8, ACPI_DMAR_OFFSET (Flags), "Flags", 0},
@@ -32,11 +33,11 @@ Index: acpica/source/common/dmtbinfo.c
ACPI_DMT_TERMINATOR
};
Index: acpica/source/compiler/dttable.c
Index: acpica-unix2-20130517/source/compiler/dttable.c
===================================================================
--- acpica.orig/source/compiler/dttable.c
+++ acpica/source/compiler/dttable.c
@@ -601,8 +601,9 @@ DtCompileDmar (
--- acpica-unix2-20130517.orig/source/compiler/dttable.c
+++ acpica-unix2-20130517/source/compiler/dttable.c
@@ -541,8 +541,9 @@ DtCompileDmar (
DT_FIELD *SubtableStart;
ACPI_DMTABLE_INFO *InfoTable;
ACPI_DMAR_HEADER *DmarHeader;
@@ -48,7 +49,7 @@ Index: acpica/source/compiler/dttable.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable, TRUE);
@@ -613,17 +614,7 @@ DtCompileDmar (
@@ -553,17 +554,7 @@ DtCompileDmar (
ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable);
@@ -67,7 +68,7 @@ Index: acpica/source/compiler/dttable.c
while (*PFieldList)
{
@@ -672,10 +663,12 @@ DtCompileDmar (
@@ -621,10 +612,12 @@ DtCompileDmar (
ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable);
@@ -81,7 +82,7 @@ Index: acpica/source/compiler/dttable.c
{
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
&Subtable, FALSE);
@@ -688,9 +681,12 @@ DtCompileDmar (
@@ -637,9 +630,12 @@ DtCompileDmar (
DtInsertSubtable (ParentTable, Subtable);
DtPushSubtable (Subtable);
@@ -95,7 +96,7 @@ Index: acpica/source/compiler/dttable.c
{
Status = DtCompileTable (PFieldList, TableInfoDmarPciPath,
&Subtable, FALSE);
@@ -702,10 +698,15 @@ DtCompileDmar (
@@ -651,10 +647,15 @@ DtCompileDmar (
ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable);
@@ -111,11 +112,11 @@ Index: acpica/source/compiler/dttable.c
}
return (AE_OK);
Index: acpica/source/compiler/dtutils.c
Index: acpica-unix2-20130517/source/compiler/dtutils.c
===================================================================
--- acpica.orig/source/compiler/dtutils.c
+++ acpica/source/compiler/dtutils.c
@@ -472,6 +472,7 @@ DtGetFieldType (
--- acpica-unix2-20130517.orig/source/compiler/dtutils.c
+++ acpica-unix2-20130517/source/compiler/dtutils.c
@@ -397,6 +397,7 @@ DtGetFieldType (
case ACPI_DMT_BUFFER:
case ACPI_DMT_BUF7:
@@ -123,7 +124,7 @@ Index: acpica/source/compiler/dtutils.c
case ACPI_DMT_BUF16:
case ACPI_DMT_BUF128:
case ACPI_DMT_PCI_PATH:
@@ -685,6 +686,10 @@ DtGetFieldLength (
@@ -630,6 +631,10 @@ DtGetFieldLength (
}
break;
@@ -133,12 +134,12 @@ Index: acpica/source/compiler/dtutils.c
+
case ACPI_DMT_BUF16:
case ACPI_DMT_UUID:
ByteLength = 16;
Index: acpica/source/include/acdisasm.h
Index: acpica-unix2-20130517/source/include/acdisasm.h
===================================================================
--- acpica.orig/source/include/acdisasm.h
+++ acpica/source/include/acdisasm.h
@@ -180,6 +180,7 @@ typedef enum
--- acpica-unix2-20130517.orig/source/include/acdisasm.h
+++ acpica-unix2-20130517/source/include/acdisasm.h
@@ -108,6 +108,7 @@ typedef enum
ACPI_DMT_UINT56,
ACPI_DMT_UINT64,
ACPI_DMT_BUF7,

6
wmidump_add_she_bang.patch
View File

@@ -2,10 +2,10 @@
wmidump/wmixtract.py | 2 ++
1 file changed, 2 insertions(+)
Index: acpica-unix2-20121220/wmidump/wmixtract.py
Index: acpica-unix2-20130517/wmidump/wmixtract.py
===================================================================
--- acpica-unix2-20121220.orig/wmidump/wmixtract.py
+++ acpica-unix2-20121220/wmidump/wmixtract.py
--- acpica-unix2-20130517.orig/wmidump/wmixtract.py
+++ acpica-unix2-20130517/wmidump/wmixtract.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+