summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/linux-libre-tools/01-fix-perf-python.patch12
-rw-r--r--libre/linux-libre-tools/PKGBUILD117
2 files changed, 106 insertions, 23 deletions
diff --git a/libre/linux-libre-tools/01-fix-perf-python.patch b/libre/linux-libre-tools/01-fix-perf-python.patch
new file mode 100644
index 000000000..d46bd773c
--- /dev/null
+++ b/libre/linux-libre-tools/01-fix-perf-python.patch
@@ -0,0 +1,12 @@
+--- a/tools/perf/config/feature-checks/Makefile 2014-01-21 01:58:25.444339009 +0100
++++ b/tools/perf/config/feature-checks/Makefile 2014-01-21 01:46:58.081780576 +0100
+@@ -103,9 +103,6 @@
+ test-libperl:
+ $(BUILD) $(FLAGS_PERL_EMBED)
+
+-override PYTHON := python
+-override PYTHON_CONFIG := python-config
+-
+ escape-for-shell-sq = $(subst ','\'',$(1))
+ shell-sq = '$(escape-for-shell-sq)'
+
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 78c0f4ea2..b29cde39e 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 102149 2013-12-05 21:51:01Z seblu $
+# $Id: PKGBUILD 104447 2014-01-21 01:10:56Z seblu $
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=linux-libre-tools
-pkgname=('linux-libre-tools-meta'
- 'libtraceevent-libre'
- 'perf-libre'
- 'cpupower-libre'
- 'x86_energy_perf_policy-libre'
- 'usbip-libre')
-_basekernel=3.12
-_sublevel=3
-_pkgver=$_basekernel.$_sublevel
+pkgname=(
+ 'acpidump-libre'
+ 'cgroup_event_listener-libre'
+ 'cpupower-libre'
+ 'libtraceevent-libre'
+ 'linux-libre-tools-meta'
+ 'perf-libre'
+ 'tmon-libre'
+ 'usbip-libre'
+ 'x86_energy_perf_policy-libre'
+)
+_basekernel=3.13
+#_sublevel=3
+#_pkgver=$_basekernel.$_sublevel
pkgver=$_basekernel
-pkgrel=2
+pkgrel=1
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -22,24 +27,28 @@ options=('!strip')
# kernel source deps
makedepends=('asciidoc' 'xmlto')
# perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl')
# cpupower-libre deps
makedepends+=('pciutils')
# usbip-libre deps
makedepends+=('glib2' 'sysfsutils')
+# tmon-libre deps
+makedepends+=('ncurses')
groups=("$pkgbase")
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz"
- "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
+ #"http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
'cpupower.default'
'cpupower.systemd'
'cpupower.service'
- 'usbipd.service')
+ 'usbipd.service'
+ '01-fix-perf-python.patch')
sha256sums=('66c1fa816cb4a3b2f6078e1f6256133697ca4cc4186758c58c2b4d0153ed3237'
'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
'4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
- '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
+ '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
+ 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a')
prepare() {
# apply stable patching set
@@ -52,36 +61,37 @@ prepare() {
}
build() {
- msg2 'Build libtraceevent-libre'
+ msg2 'libtraceevent-libre'
pushd linux-$pkgver/tools/lib/traceevent
make
popd
- msg2 'Build perf-libre'
+ msg2 'perf-libre'
pushd linux-$pkgver/tools/perf
make \
WERROR=0 \
DESTDIR="$pkgdir/usr" \
perfexecdir='lib/perf' \
PYTHON=python2 \
+ PYTHON_CONFIG=python2-config \
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
all man
popd
- msg2 'Build cpupower-libre'
+ msg2 'cpupower-libre'
pushd linux-$pkgver/tools/power/cpupower
# we cannot use --as-needed
- LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
+ #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
make VERSION=$pkgver-$pkgrel
popd
- msg2 'Build x86_energy_perf_policy-libre'
+ msg2 'x86_energy_perf_policy-libre'
pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
make
popd
- msg2 'Build usbip-libre'
+ msg2 'usbip-libre'
pushd linux-$pkgver/drivers/staging/usbip/userspace
# fix missing man page
sed -i 's/usbip_bind_driver.8//' Makefile.am
@@ -89,12 +99,37 @@ build() {
./configure --prefix=/usr --sbindir=/usr/bin
make
popd
+
+ msg2 'tmon-libre'
+ pushd linux-$pkgver/tools/thermal/tmon
+ make
+ popd
+
+ msg2 'acpidump-libre'
+ pushd linux-$pkgver/tools/power/acpi
+ make
+ popd
+
+ msg2 'cgroup_event_listener-libre'
+ pushd linux-$pkgver/tools/cgroup
+ make
+ popd
}
package_linux-libre-tools-meta() {
pkgdesc='Linux kernel tools meta package'
groups=()
- depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+ depends=(
+ 'acpidump-libre'
+ 'cgroup_event_listener-libre'
+ 'cpupower-libre'
+ 'libtraceevent-libre'
+ 'linux-libre-tools-meta'
+ 'perf-libre'
+ 'tmon-libre'
+ 'usbip-libre'
+ 'x86_energy_perf_policy-libre'
+ )
replaces=('linux-tools-meta')
conflicts=('linux-tools-meta')
provides=("linux-tools-meta=$pkgver")
@@ -114,7 +149,8 @@ package_libtraceevent-libre() {
package_perf-libre() {
pkgdesc='Linux kernel performance auditing tool'
- depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
+ depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils'
+ 'numactl')
replaces=('perf')
conflicts=('perf')
provides=("perf=$pkgver")
@@ -125,6 +161,7 @@ package_perf-libre() {
DESTDIR="$pkgdir/usr" \
perfexecdir='lib/perf' \
PYTHON=python2 \
+ PYTHON_CONFIG=python2-config \
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
install install-man
@@ -186,4 +223,38 @@ package_usbip-libre() {
install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
}
+package_tmon-libre() {
+ pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem'
+ depends=('glibc' 'ncurses')
+ replaces=('tmon')
+ conflicts=('tmon')
+ provides=("tmon=$pkgver")
+
+ cd linux-$pkgver/tools/thermal/tmon
+ make install INSTALL_ROOT="$pkgdir"
+}
+
+package_acpidump-libre() {
+ pkgdesc='Dump system ACPI tables to an ASCII file'
+ depends=('glibc')
+ replaces=('acpidump')
+ conflicts=('acpidump' 'iasl')
+ provides=("acpidump=$pkgver")
+
+ cd linux-$pkgver/tools/power/acpi
+ install -Dm755 acpidump "$pkgdir/usr/bin/acpidump"
+ install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
+}
+
+package_cgroup_event_listener-libre() {
+ pkgdesc='Simple listener of cgroup events'
+ depends=('glibc')
+ replaces=('cgroup_event_listener')
+ conflicts=('cgroup_event_listener')
+ provides=("cgroup_event_listener=$pkgver")
+
+ cd linux-$pkgver/tools/cgroup
+ install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
+}
+
# vim:set ts=2 sw=2 et: