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

8 files changed, 27 insertions, 8 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index d3154ac86..7e988e5dc 100755..100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -3,12 +3,12 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-tools
-pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
-_basekernel=3.6
+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=1
+pkgrel=3.1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -17,7 +17,7 @@ options=('!strip')
 # kernel source deps
 makedepends=('asciidoc' 'xmlto')
 # perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
 # cpupower-libre deps
 makedepends+=('pciutils')
 # usbip-libre deps
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'usbipd.conf'
         'usbipd.rc'
         'usbipd.service')
-md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '56883c159381ba89e50ab8ea65efec77'
          '5fc1fcda4cef93f16e752b1931db23e3'
          'c0d17b5295fe964623c772a2dd981771'
@@ -48,6 +48,11 @@ build() {
     patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
+  msg2 'Build libtraceevent-libre'
+  pushd linux-$pkgver/tools/lib/traceevent
+  make
+  popd
+
   msg2 'Build perf-libre'
   pushd linux-$pkgver/tools/perf
   make \
@@ -74,15 +79,29 @@ build() {
 
   msg2 'Build usbip-libre'
   pushd linux-$pkgver/drivers/staging/usbip/userspace
+  # fix missing man page
+  sed -i 's/usbip_bind_driver.8//' Makefile.am
   ./autogen.sh
   ./configure --prefix=/usr
   make
   popd
 }
 
+package_libtraceevent-libre() {
+  pkgdesc='Linux kernel trace event library'
+  depends=('glibc')
+  replaces=('libtraceevent')
+  conflicts=('libtraceevent')
+  provides=("libtraceevent=$pkgver")
+
+  cd linux-$pkgver/tools/lib/traceevent
+  install -dm 755 "$pkgdir/usr/lib"
+  install -m 644 libtraceevent.a libtraceevent.so "$pkgdir/usr/lib"
+}
+
 package_perf-libre() {
-  pkgdesc='Linux-libre kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils')
+  pkgdesc='Linux kernel performance auditing tool'
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
   replaces=('perf')  
   conflicts=('perf')
   provides=("perf=$pkgver")
@@ -99,7 +118,7 @@ package_perf-libre() {
 }
 
 package_cpupower-libre() {
-  pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
+  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/conf.d/cpupower')
   depends=('bash' 'pciutils')
   replaces=('cpupower' 'cpufrequtils')
diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf
index b5c522ea1..b5c522ea1 100755..100644
--- a/libre/linux-libre-tools/cpupower.conf
+++ b/libre/linux-libre-tools/cpupower.conf
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
index 88edaf791..88edaf791 100755..100644
--- a/libre/linux-libre-tools/cpupower.rc
+++ b/libre/linux-libre-tools/cpupower.rc
diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service
index aaeba2b08..aaeba2b08 100755..100644
--- a/libre/linux-libre-tools/cpupower.service
+++ b/libre/linux-libre-tools/cpupower.service
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
index f45b02bc8..f45b02bc8 100755..100644
--- a/libre/linux-libre-tools/cpupower.systemd
+++ b/libre/linux-libre-tools/cpupower.systemd
diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf
index 5990b857a..5990b857a 100755..100644
--- a/libre/linux-libre-tools/usbipd.conf
+++ b/libre/linux-libre-tools/usbipd.conf
diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc
index 15a1bcf00..15a1bcf00 100755..100644
--- a/libre/linux-libre-tools/usbipd.rc
+++ b/libre/linux-libre-tools/usbipd.rc
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
index ac2f5f7c1..ac2f5f7c1 100755..100644
--- a/libre/linux-libre-tools/usbipd.service
+++ b/libre/linux-libre-tools/usbipd.service