Wed May 23 00:02:37 UTC 2012

1 files changed, 32 insertions, 17 deletions

diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index 83e3dfd58..a0e3427da 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,12 +1,10 @@
-# $Id: PKGBUILD 70002 2012-04-28 01:09:18Z seblu $
+# $Id: PKGBUILD 71019 2012-05-21 21:06:32Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=linux-tools
 pkgname=('perf' 'cpupower')
-pkgver=3.3
-kernver=${pkgver}.4
-[[ ${kernver##*rc} != $kernver ]] && testing='testing'
-pkgrel=4
+pkgver=3.4
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -14,25 +12,38 @@ options=('!strip')
 makedepends=('asciidoc' 'xmlto')
 # split packages need all package dependencies set manually in makedepends
 makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils')
-source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernver.tar.xz"
+source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz"
+#        "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.4.xz"
         'cpupower.rc'
         'cpupower.conf'
         'cpupower.service')
-md5sums=('1cf9bbadf579734c57ed2e2081895692'
+md5sums=('967f72983655e2479f951195953e8480'
          '73dbc931e86b3b73d6e2338dcbee81a4'
          '857ccdd0598511e3bf4b63522754dc48'
          '20870541e88109d2f153be3c58a277f1')
 
 build() {
+  # apply stable patching set
+  if [[ -e "$srcdir"/patch-* ]]; then
+    msg2 'Applying stable patch set'
+    patch -N -p1 -i "$srcdir"/patch-*
+  fi
+
   msg2 'Build perf'
-  cd linux-$kernver/tools/perf
-  make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" \
-    PERF_VERSION=$pkgver-$pkgrel all man
+  pushd linux-$pkgver/tools/perf
+  make \
+    DESTDIR="$pkgdir/usr" \
+    perfexecdir="lib/$pkgname" \
+    PYTHON=python2 \
+    NO_GTK2=1 \
+    PERF_VERSION=$pkgver-$pkgrel \
+    all man
+  popd
 
   msg2 'Build cpupower'
+  cd linux-$pkgver/tools/power/cpupower
   # we cannot use --as-needed
   LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
-  cd "$srcdir/linux-$kernver/tools/power/cpupower"
   make VERSION=$pkgver-$pkgrel
 }
 
@@ -40,9 +51,14 @@ package_perf() {
   pkgdesc='Linux kernel performance auditing tool'
   depends=('python2' 'libnewt' 'elfutils')
 
-  cd linux-${kernver}/tools/perf
-  make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" \
-    PERF_VERSION=$pkgver install install-man
+  cd linux-$pkgver/tools/perf
+  make \
+    DESTDIR="$pkgdir/usr" \
+    perfexecdir="lib/$pkgname" \
+    PYTHON=python2 \
+    NO_GTK2=1 \
+    PERF_VERSION=$pkgver-$pkgrel \
+    install install-man
 }
 
 package_cpupower() {
@@ -51,18 +67,17 @@ package_cpupower() {
   depends=('pciutils')
   conflicts=('cpufrequtils')
 
-  cd linux-$kernver/tools/power/cpupower
+  pushd linux-$pkgver/tools/power/cpupower
   make \
     DESTDIR="$pkgdir" \
     mandir='/usr/share/man' \
     docdir='/usr/share/doc/cpupower' \
     install install-man
+  popd
   # install rc.d script
-  cd "$srcdir"
   install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
   install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
   install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
-
 }
 
 # vim:set ts=2 sw=2 ft=sh et: