summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-06-07 01:39:12 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-06-07 01:39:12 +0000
commit1318f6b929c3d229f8ce62a868058618bd578f1e (patch)
treeb82417ccd23f37a36595d19422c71baba65a4e2e /sys-power/pmtools
parentBug #187537, version bump. MADT patch integrated upstream. (diff)
downloadgentoo-2-1318f6b929c3d229f8ce62a868058618bd578f1e.tar.gz
gentoo-2-1318f6b929c3d229f8ce62a868058618bd578f1e.tar.bz2
gentoo-2-1318f6b929c3d229f8ce62a868058618bd578f1e.zip
Respin the pmtools patch.
(Portage version: 2.1.5.4)
Diffstat (limited to 'sys-power/pmtools')
-rw-r--r--sys-power/pmtools/ChangeLog6
-rw-r--r--sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch42
-rw-r--r--sys-power/pmtools/pmtools-20071116.ebuild7
3 files changed, 51 insertions, 4 deletions
diff --git a/sys-power/pmtools/ChangeLog b/sys-power/pmtools/ChangeLog
index 866bb22f5f5b..cf69830c6879 100644
--- a/sys-power/pmtools/ChangeLog
+++ b/sys-power/pmtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-power/pmtools
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.5 2008/06/07 01:23:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.6 2008/06/07 01:39:12 robbat2 Exp $
+
+ 07 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/pmtools-20071116-acpixtract-pmtools.patch, pmtools-20071116.ebuild:
+ Respin the pmtools patch.
*pmtools-20071116 (07 Jun 2008)
diff --git a/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch b/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch
new file mode 100644
index 000000000000..1e733663f3ed
--- /dev/null
+++ b/sys-power/pmtools/files/pmtools-20071116-acpixtract-pmtools.patch
@@ -0,0 +1,42 @@
+diff -Nuar --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/acpixtract/acpixtract.c pmtools-20071116/acpixtract/acpixtract.c
+--- pmtools-20071116.orig/acpixtract/acpixtract.c 2007-11-16 10:45:44.000000000 -0800
++++ pmtools-20071116/acpixtract/acpixtract.c 2008-06-06 18:28:34.203106692 -0700
+@@ -199,7 +199,7 @@
+ void)
+ {
+
+- printf ("Usage: acpixtract [option] <InputFile>\n");
++ printf ("Usage: acpixtract-pmtools [option] <InputFile>\n");
+ printf ("\nExtract binary ACPI tables from text acpidump output\n");
+ printf ("Default invocation extracts all DSDTs and SSDTs\n");
+ printf ("Version %8.8X\n\n", VERSION);
+diff -Nuar --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/madt/README pmtools-20071116/madt/README
+--- pmtools-20071116.orig/madt/README 2007-11-16 10:39:50.000000000 -0800
++++ pmtools-20071116/madt/README 2008-06-06 18:30:18.101885794 -0700
+@@ -2,7 +2,7 @@
+ Hacked out of Linux kernel code to do the same.
+
+ # ./acpidmp > acpidump.txt
+-$ acpixtract -a acpidump.txt
++$ acpixtract-pmtools -a acpidump.txt
+ $ madt < APIC.dat
+
+ ACPI: APIC (v001 INTEL D845EBT2 0x20021021 MSFT 0x00000097) @ 0x(nil)
+diff -Nuar --exclude '*.orig' --exclude '*.rej' pmtools-20071116.orig/README pmtools-20071116/README
+--- pmtools-20071116.orig/README 2007-11-16 10:54:27.000000000 -0800
++++ pmtools-20071116/README 2008-06-06 18:29:53.513505961 -0700
+@@ -24,11 +24,11 @@
+ and it is why the output doesn't change when different
+ kernels are booted.
+
+-./acpidump/acpixtract
+---------------------
++./acpidump/acpixtract-pmtools
++-----------------------------
+ Convert ASCII acpidump output to raw binary tables:
+
+- $ acpixtract/acpixtract -a acpidump.txt
++ $ acpixtract/acpixtract-pmtools -a acpidump.txt
+ Acpi table [DSDT] - 15974 bytes written to DSDT.dat
+ Acpi table [FACS] - 64 bytes written to FACS.dat
+ Acpi table [FACP] - 116 bytes written to FACP.dat
diff --git a/sys-power/pmtools/pmtools-20071116.ebuild b/sys-power/pmtools/pmtools-20071116.ebuild
index 681e0d959bd7..576495161a36 100644
--- a/sys-power/pmtools/pmtools-20071116.ebuild
+++ b/sys-power/pmtools/pmtools-20071116.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20071116.ebuild,v 1.1 2008/06/07 01:23:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20071116.ebuild,v 1.2 2008/06/07 01:39:12 robbat2 Exp $
inherit eutils toolchain-funcs
@@ -20,6 +20,8 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/${PN}-20071116-acpixtract-pmtools.patch
+
# Integrated upstream
#epatch "${FILESDIR}"/${PN}-20070714-madt.patch
@@ -37,12 +39,11 @@ src_install() {
dosbin acpidump/acpidump
# the other tools only process data
newbin acpixtract/acpixtract acpixtract-pmtools
- dobin acpidump/acpitbl
dobin madt/madt
dodoc README
docinto madt
- dodoc madt/README madt/APIC*
+ dodoc madt/README madt/example.APIC*
}
pkg_postinst() {