Fri Jan 6 23:14:57 UTC 2012

1 files changed, 18 insertions, 17 deletions

diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index 34165dbe9..345d8f9ad 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,9 +1,11 @@
-# $Id: PKGBUILD 59838 2011-12-01 00:13:46Z seblu $
+# $Id: PKGBUILD 61664 2012-01-06 00:12:09Z seblu $
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 
 pkgbase=linux-tools
 pkgname=('perf' 'cpupower')
-pkgver=3.1.4
+pkgver=3.2
+kernver=${pkgver}
+[[ ${kernver##*rc} != $kernver ]] && testing='testing'
 pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64')
@@ -12,53 +14,52 @@ 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/linux-$pkgver.tar.xz"
+source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernver.tar.xz"
         'cpupower.rc'
         'cpupower.conf') 
-md5sums=('e48e246675a3e790062d4fecf36cd6e3'
+md5sums=('364066fa18767ec0ae5f4e4abcf9dc51'
          'd8b119eff7dc1a2d655eb71a47fa6215'
          '218fd36a7957d3170ed8bd1a0be1f62f')
 
 build() {
   msg2 'Build perf'
-  cd linux-$pkgver/tools/perf
-  make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \
+  cd linux-$kernver/tools/perf
+  make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver-$pkgrel \
     all man
 
   msg2 'Build cpupower'
   # we cannot use --as-needed
   LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
-  cd "$srcdir/linux-$pkgver/tools/power/cpupower"
-  make
+  cd "$srcdir/linux-$kernver/tools/power/cpupower"
+  make VERSION=$pkgver-$pkgrel
 }
 
 package_perf() {
-  pkgdesc='Linux kernel perf tool'
+  pkgdesc='Linux kernel performance auditing tool'
   depends=('python2' 'libnewt' 'elfutils')
 
-  cd linux-${pkgver}/tools/perf
+  cd linux-${kernver}/tools/perf
   make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \
     install install-man
 }
 
 package_cpupower() {
-  pkgdesc='Linux kernel power tool'
+  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/conf.d/cpupower')
   depends=('pciutils')
   conflicts=('cpufrequtils')
-  provides=("cpufrequtils=$pkgver")
 
-  cd linux-$pkgver/tools/power/cpupower
+  # install rc.d script
+  install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
+  install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+
+  cd linux-$kernver/tools/power/cpupower
   make \
     DESTDIR="$pkgdir" \
     INSTALL='/bin/install -c' \
     mandir='/usr/share/man' \
     docdir='/usr/share/doc/cpupower' \
     install install-man
-
-  # install rc.d script
-  install -D -m 755 "$srcdir/cpupower.rc" "$pkgdir/etc/rc.d/cpupower"
-  install -D -m 644 "$srcdir/cpupower.conf" "$pkgdir/etc/conf.d/cpupower"
 }
 
 # vim:set ts=2 sw=2 ft=sh et: