# ChangeLog for sys-power/pmtools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.12 2009/09/23 20:57:57 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/ChangeLog,v 1.13 2010/04/05 05:19:58 nerdboy Exp $
+
+*pmtools-20100123 (05 Apr 2010)
+
+ 05 Apr 2010; Steve Arnold <nerdboy@gentoo.org> +pmtools-20100123.ebuild,
+ +files/pmtools-20100123-acpixtract-pmtools.patch,
+ +files/pmtools-20100123-cflags-ldflags.patch,
+ +files/pmtools-20100123-madt.patch:
+ Updated to current release; closes bug 308233. Thanks to Philipp
+ Nordhus <philipp@tigerclaw.de> for submitting the bug with updated
+ patches. Includes new turbostat tool for Intel CPUs.
23 Sep 2009; Patrick Lauer <patrick@gentoo.org> pmtools-20071116.ebuild,
pmtools-20071116-r1.ebuild:
AUX pmtools-20071116-64bit.patch 674 RMD160 d77490b14a5824f56e6c4cb1c4b87027c7392180 SHA1 e5287c9cb6a476645ee992588a8a2fad7cabb96f SHA256 4c2087bf707eeac438b9d4ef0934de5531b2ab3d1e1f28fb0fddac2ac0940516
AUX pmtools-20071116-acpixtract-pmtools.patch 1909 RMD160 29d0d477b0fd4c17c5c780890f8d7c3830353729 SHA1 81a1fab47e202fae77851cbceb519eb5ca7c133c SHA256 90d0b281563a3389ff90d2bcd3cea7492876c395c80e7050fe14a8f1f244d235
AUX pmtools-20071116-cflags-ldflags.patch 958 RMD160 294938ebc18edb7fd6f950676a837d86c3bf5c53 SHA1 55fefbb9ce20d1c7b518cd5574330a32581b7918 SHA256 8a078c5c7341af90d5b71fc94997971a3af89b51f3ec9d2f62b184f1967939ba
+AUX pmtools-20100123-acpixtract-pmtools.patch 1822 RMD160 aaf44d437596088df8fa75ab10f553e9bf48c771 SHA1 5cdcb3ba8e48e8d8758d35473fedc9f26bbbf30b SHA256 742d457f572fa30029f28998640ee6a4f8bc38ff12cebefd0063247bcd3bac8c
+AUX pmtools-20100123-cflags-ldflags.patch 1919 RMD160 87c67b1ff9d690fda5f259ebb1c808d058e640ac SHA1 074555acfd72fdd452b219eaed237d7079e1daec SHA256 394ef62903c068c94c5fa6b3a75370911314c224931577742d9d6efc6816a6d8
+AUX pmtools-20100123-madt.patch 1191 RMD160 ca99ebfaccb8432736580ac8facbd46505774b80 SHA1 1a7fcf120c1835cd2c4041177cf26d452b264153 SHA256 eb01a911c3b4261a1d80478c88b48c1c11bde01cd1de1f4b8dc97c9fd6163bf0
DIST pmtools-20071116.tar.gz 51566 RMD160 b96b8334fa400fa49cfe21cd285481e48b57e2bb SHA1 997612de90eee65c3974a07b9eee68cfeb077abd SHA256 91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748
+DIST pmtools-20100123.tar.gz 59303 RMD160 05472ff049a279bc10ba392a3568744473f6bb05 SHA1 beb3e83826410780ad9bd424e4b7a5966e23817a SHA256 8f98775e00102eeaebfe4594176e99652d9bc76d1b886ebd054980d27a79a407
EBUILD pmtools-20071116-r1.ebuild 1377 RMD160 3c4c0b02a5f3e0506cc73b4456372945321374d8 SHA1 06806a6ea5d6acd57fb0fd065ec5a3e67722f580 SHA256 33bfcff6e5df574a75d9faf09e95078123dc99ed7b7018d03826ece8228900ef
EBUILD pmtools-20071116.ebuild 1419 RMD160 5ef9e0202a64fb42f5ffca9232f3b077373a8a76 SHA1 2dae37bc42a3157a46ceacea1d7790aa4fb9d171 SHA256 d5290944a2332b3ba6588be47e092760c85ff210ae4b3945567087cd9b648515
-MISC ChangeLog 3039 RMD160 bf0490a2e49f3d46e6866cf2aae8e7c69f123520 SHA1 b9f57b7f9c66c8c75a983e79d4b9cf41d568cfd0 SHA256 30ce7f1ce2a1cadf0f3147bd0a52736be81c1fdf09ef91f7395e29c8e91519d1
+EBUILD pmtools-20100123.ebuild 1442 RMD160 76ed7055e0f160f2e95162d905689efd26e61b34 SHA1 f8f8c8a15076d64ef4bb75db2553cf9ec1a061f3 SHA256 b3726f889d842ebc8b48216dff1c43e16ed100db2c1696b5ff9b0889ec5066d8
+MISC ChangeLog 3480 RMD160 3136372668ac7c058884c6adecbaada330851507 SHA1 ff69f10642fc71ebc7f1d4d5e6f20a6e0dd49fd2 SHA256 0f8b9682535015e50f06acc3b27a0ac2e2eac1750f53834166ebfd555455d847
MISC metadata.xml 533 RMD160 06d6822d1d37fe42df032895be61852d748b4e60 SHA1 a0891a3a28f82a70ca3067431b2aebd8dd35b496 SHA256 095b685564533cd746483e96e141521b72a5cf63add86c58c7c4989aa0ec97b2
--- /dev/null
+diff -Nuar pmtools-20100123.orig/acpixtract/acpixtract.c pmtools-20100123/acpixtract/acpixtract.c
+--- pmtools-20100123.orig/acpixtract/acpixtract.c 2010-01-23 19:31:07.000000000 +0100
++++ pmtools-20100123/acpixtract/acpixtract.c 2010-03-07 14:44:32.451141841 +0100
+@@ -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 pmtools-20100123.orig/madt/README pmtools-20100123/madt/README
+--- pmtools-20100123.orig/madt/README 2005-11-11 18:07:04.000000000 +0100
++++ pmtools-20100123/madt/README 2010-03-07 14:45:31.818052302 +0100
+@@ -1,7 +1,7 @@
+ User utility to parse the ACPI MADT
+ Hacked out of Linux kernel code to do the same.
+
+-# ./acpidmp | ./acpixtract APIC | ./madt
++# ./acpidmp | ./acpixtract-pmtools APIC | ./madt
+
+ ACPI: APIC (v001 INTEL D845EBT2 0x20021021 MSFT 0x00000097) @ 0x(nil)
+ ACPI: LAPIC (acpi_id[0x01] lapic_id[0x00] enabled)
+diff -Nuar pmtools-20100123.orig/README pmtools-20100123/README
+--- pmtools-20100123.orig/README 2010-01-23 19:31:52.000000000 +0100
++++ pmtools-20100123/README 2010-03-07 14:47:18.286017297 +0100
+@@ -17,11 +17,11 @@
+
+ # ./acpidump > acpidump.out
+
+-./acpidump/acpixtract
+---------------------
++./acpidump/acpixtract-pmtools
++-----------------------------
+ Convert ASCII acpidump output to raw binary tables:
+
+- $ acpixtract/acpixtract -a acpidump.out
++ $ acpixtract/acpixtract-pmtools -a acpidump.out
+ 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
--- /dev/null
+diff -Nuar pmtools-20100123.orig/acpidump/Makefile pmtools-20100123/acpidump/Makefile
+--- pmtools-20100123.orig/acpidump/Makefile 2006-11-30 13:41:15.000000000 +0100
++++ pmtools-20100123/acpidump/Makefile 2010-03-07 14:19:12.337141824 +0100
+@@ -1,11 +1,11 @@
+ 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)
++CFLAGS += -Wall -Wstrict-prototypes -Wdeclaration-after-statement -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
+
+ all: acpidump
+ $(PROG) : $(SRCS)
+- $(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG)
+
+ CLEANFILES= $(PROG)
+
+diff -Nuar pmtools-20100123.orig/acpixtract/Makefile pmtools-20100123/acpixtract/Makefile
+--- pmtools-20100123.orig/acpixtract/Makefile 2006-11-30 13:45:06.000000000 +0100
++++ pmtools-20100123/acpixtract/Makefile 2010-03-07 14:19:12.337141824 +0100
+@@ -6,7 +6,7 @@
+ all: $(PROG)
+
+ $(PROG) : $(SRCS)
+- $(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG)
+
+ CLEANFILES= $(PROG)
+
+diff -Nuar pmtools-20100123.orig/madt/Makefile pmtools-20100123/madt/Makefile
+--- pmtools-20100123.orig/madt/Makefile 2005-11-11 18:07:04.000000000 +0100
++++ pmtools-20100123/madt/Makefile 2010-03-07 14:22:15.199017246 +0100
+@@ -1,6 +1,6 @@
+ test: madt
+ ./madt < APIC
+ madt: madt.c acpi.h tables.c
+- cc -o madt madt.c
++ $(CC) $(CFLAGS) $(LDFLAGS) madt.c -o madt
+ clean:
+ rm madt
+diff -Nuar pmtools-20100123.orig/turbostat/Makefile pmtools-20100123/turbostat/Makefile
+--- pmtools-20100123.orig/turbostat/Makefile 2010-01-23 19:19:32.000000000 +0100
++++ pmtools-20100123/turbostat/Makefile 2010-03-07 14:26:10.473010923 +0100
+@@ -4,7 +4,7 @@
+ all: turbostat
+
+ $(PROG) : $(SRCS)
+- $(CC) $(CFLAGS) $(SRCS) -o $(PROG)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG)
+
+ CLEANFILES= $(PROG)
+
--- /dev/null
+diff -Nuar pmtools-20100123.orig/madt/madt.c pmtools-20100123/madt/madt.c
+--- pmtools-20100123.orig/madt/madt.c 2005-11-11 18:07:04.000000000 +0100
++++ pmtools-20100123/madt/madt.c 2010-03-07 14:39:31.657017114 +0100
+@@ -26,8 +26,6 @@
+
+ #define printk printf
+
+-#include "./tables.c"
+-
+ //#define INPUT_FILE "madt.dat"
+ //#include <sys/types.h>
+ //#include <sys/stat.h>
+@@ -37,6 +35,8 @@
+ #include <stdio.h> // fread
+ #include <stdlib.h> // malloc
+
++#include "./tables.c"
++
+ int verbose = 0;
+ /*
+ /* read standard input
+diff -Nuar pmtools-20100123.orig/madt/Makefile pmtools-20100123/madt/Makefile
+--- pmtools-20100123.orig/madt/Makefile 2005-11-11 18:07:04.000000000 +0100
++++ pmtools-20100123/madt/Makefile 2010-03-07 14:34:17.486002917 +0100
+@@ -1,3 +1,5 @@
++all: madt
++
+ test: madt
+ ./madt < APIC
+ madt: madt.c acpi.h tables.c
+diff -Nuar pmtools-20100123.orig/Makefile pmtools-20100123/Makefile
+--- pmtools-20100123.orig/Makefile 2010-01-23 19:18:18.000000000 +0100
++++ pmtools-20100123/Makefile 2010-03-07 14:33:01.729955480 +0100
+@@ -1,4 +1,4 @@
+-DIRS = acpidump acpixtract turbostat
++DIRS = acpidump acpixtract madt turbostat
+
+ all:
+ for i in $(DIRS); do $(MAKE) -C $$i $@; done
--- /dev/null
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pmtools/pmtools-20100123.ebuild,v 1.1 2010/04/05 05:19:58 nerdboy Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="ACPI disassembler tools, including acpidump"
+HOMEPAGE="http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/"
+SRC_URI="http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-lang/perl
+ >=sys-power/iasl-20090521"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-acpixtract-pmtools.patch
+ epatch "${FILESDIR}"/${P}-cflags-ldflags.patch
+ epatch "${FILESDIR}"/${P}-madt.patch
+ epatch "${FILESDIR}"/${PN}-20071116-64bit.patch
+
+ strip-unsupported-flags
+}
+
+src_compile() {
+ # respect user's LDFLAGS
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+ # acpidump access the ACPI data via /dev/mem or EFI firmware in /sys
+ dosbin acpidump/acpidump
+ # the other tools only process data
+ newbin acpixtract/acpixtract acpixtract-pmtools
+ dobin madt/madt
+ dosbin turbostat/turbostat
+
+ dodoc README
+ docinto madt
+ dodoc madt/README madt/APIC*
+}
+
+pkg_postinst() {
+ ewarn "Please note that acpixtract is now named acpixtract-pmtools to avoid"
+ ewarn "conflicts with the new tool of the same name from the iasl package."
+}
projects / gentoo.git / commitdiff