Merge branch 'master' of ssh://gparabola/srv/git/abslibre

Conflicts:
	libre/your-freedom/PKGBUILD

1 files changed, 36 insertions, 15 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 61941f7a2..b7dc50f94 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -3,10 +3,13 @@
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=linux-libre-tools
+_pkgname=('perf' 'cpupower')
 pkgname=('perf-libre' 'cpupower-libre')
-pkgver=3.3
-kernver=${pkgver}.4
-pkgrel=4.1
+_basekernel=3.4
+#_sublevel=1
+#pkgver=${_basekernel}.${_sublevel}
+pkgver=${_basekernel}
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -14,25 +17,39 @@ options=('!strip')
 makedepends=('asciidoc' 'xmlto')
 # split packages need all package dependencies set manually in makedepends
 makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$kernver-gnu/linux-libre-$kernver-gnu.tar.xz"
+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"
         'cpupower.rc'
         'cpupower.conf'
         'cpupower.service')
-md5sums=('ab3fcfc16f3ac3f7b5741c260a949165'
+md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          '73dbc931e86b3b73d6e2338dcbee81a4'
          '18d5aa9e4c6bb23bb02bf65e155e0f0e'
          '20870541e88109d2f153be3c58a277f1')
 
 build() {
+  cd "${srcdir}/linux-${_basekernel}"
+
+  if [ "${_basekernel}" != "${pkgver}" ]; then
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  fi
+
+  cd ${srcdir}
   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
 }
 
@@ -43,9 +60,14 @@ package_perf-libre() {
   conflicts=('perf')
   provides=("perf=$pkgver")
 
-  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-libre() {
@@ -56,18 +78,17 @@ package_cpupower-libre() {
   conflicts=('cpupower' 'cpufrequtils')
   provides=("cpupower=$pkgver")
 
-  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: