Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 42 insertions, 30 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 7e988e5dc..66e4551bd 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,14 +1,19 @@
 # $Id$
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-tools
-pkgname=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
-_basekernel=3.7
-#_sublevel=1
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
-pkgrel=3.1
+pkgname=('linux-libre-tools-meta'
+         'libtraceevent-libre'
+         'perf-libre'
+         'cpupower-libre'
+         'x86_energy_perf_policy-libre'
+         'usbip-libre')
+_basekernel=3.8
+#_sublevel=6
+_pkgver=$_basekernel.$_sublevel
+pkgver=$_basekernel
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -23,29 +28,25 @@ makedepends+=('pciutils')
 # usbip-libre deps
 makedepends+=('glib2' 'sysfsutils')
 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"
-        'cpupower.conf'
-        'cpupower.rc'
+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.default'
         'cpupower.systemd'
         'cpupower.service'
-        'usbipd.conf'
-        'usbipd.rc'
         'usbipd.service')
-md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
-         '56883c159381ba89e50ab8ea65efec77'
-         '5fc1fcda4cef93f16e752b1931db23e3'
-         'c0d17b5295fe964623c772a2dd981771'
-         '2450e8ff41b30eb58d43b5fffbfde1f4'
-         'e8fac9c45a628015644b4150b139278a'
-         '8a3831d962ff6a9968c0c20fd601cdec'
-         'ba7c1c513314dd21fb2334fb8417738f')
+sha256sums=('c834438a5c3f60f261c415664cfee5bf265d0329175796df048996c7afabc03f'
+            '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
+            'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
+            'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
+            '8053a6bcd0776a7fefccc5012f93a1710653529e0eab59afcc39f24361c64869')
 
 build() {
   # apply stable patching set
-  if [ "${_basekernel}" != "${pkgver}" ]; then
+  if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then
     msg2 'Applying stable patch set'
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+    cd linux-$pkgver
+    patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu
+    cd ..
   fi
 
   msg2 'Build libtraceevent-libre'
@@ -87,6 +88,15 @@ build() {
   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')
+  replaces=('linux-tools-meta')
+  conflicts=('linux-tools-meta')
+  provides=("linux-tools-meta=$pkgver") 
+}
+
 package_libtraceevent-libre() {
   pkgdesc='Linux kernel trace event library'
   depends=('glibc')
@@ -101,7 +111,7 @@ package_libtraceevent-libre() {
 
 package_perf-libre() {
   pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
   replaces=('perf')  
   conflicts=('perf')
   provides=("perf=$pkgver")
@@ -115,15 +125,20 @@ package_perf-libre() {
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     install install-man
+  # move completion in new directory
+  cd "$pkgdir"
+  install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/perf
+  rm -r usr/etc
 }
 
 package_cpupower-libre() {
   pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
-  backup=('etc/conf.d/cpupower')
+  backup=('etc/default/cpupower')
   depends=('bash' 'pciutils')
   replaces=('cpupower' 'cpufrequtils')
   conflicts=('cpupower' 'cpufrequtils')
   provides=("cpupower=$pkgver")
+  install=cpupower.install
 
   pushd linux-$pkgver/tools/power/cpupower
   make \
@@ -133,8 +148,7 @@ package_cpupower-libre() {
     install install-man
   popd
   # install startup scripts
-  install -Dm 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
-  install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+  install -Dm 644 cpupower.default "$pkgdir/etc/default/cpupower"
   install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
   install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
 }
@@ -165,9 +179,7 @@ package_usbip-libre() {
   # module loading
   install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
   printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
-  # install daemon scripts
-  install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd"
-  install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd"
+  # systemd
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }