From 43156416e919383c5e8a88f7862696635ba63c99 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 14 May 2015 14:19:46 +0000
Subject: [PATCH] community/linux-tools to 4.0-2

---
 .../linux-tools/02-archlinux-paths.patch      |  2 +-
 community/linux-tools/PKGBUILD                | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/community/linux-tools/02-archlinux-paths.patch b/community/linux-tools/02-archlinux-paths.patch
index 223e7d783..e16ea43b5 100644
--- a/community/linux-tools/02-archlinux-paths.patch
+++ b/community/linux-tools/02-archlinux-paths.patch
@@ -13,7 +13,7 @@
 @@ -573,7 +573,7 @@
  ETC_PERFCONFIG = etc/perfconfig
  endif
- ifeq ($(IS_X86_64),1)
+ ifeq ($(ARCH)$(IS_64_BIT), x861)
 -lib = lib64
 +lib = lib
  else
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index 0b9de04dd..d10b9e87b 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Sébastien Luttringer
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - removed x86_energy_perf_policy build/package, uses x86 asm
+#  - removed x86_energy_perf_policy and turbostat build/package, uses x86 asm
 #  - removed numactl dep
 
 pkgbase=linux-tools
@@ -17,7 +17,7 @@ pkgname=(
   'usbip'
 )
 pkgver=4.0
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -34,9 +34,10 @@ makedepends+=('glib2' 'sysfsutils' 'udev')
 # tmon deps
 makedepends+=('ncurses')
 groups=("$pkgbase")
-validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886') # Linus Torvalds
+validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
+              '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman
 source=("http://ftp.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-$pkgver.tar"{.xz,.sign}
-        #"http://ftp.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/patch-$pkgver.7.xz"
+        "http://ftp.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/patch-$pkgver.3"{.xz,.sign}
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
@@ -46,19 +47,22 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-$pkgver.t
 # http://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256sums=('0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991'
             'SKIP'
-            '6d54f1dcd4d9441644a7ef4445f6633158e666fddaa6f06bb6656ab2ff4509d4'
+            'e8e42b67cd5ca28d3cd85b868a8caf6c0b971c948d6695ea6e399e132664de83'
+            'SKIP'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
-            'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570'
+            '91f7d91d4270f207102c469c575dd176c3be7897d78d26057d047db164eaf9ca'
             'e5543d8d6d3fbc7f8d9d25c428a882737d2e0169455f70cbc3f73076ff33dd5d')
 
 prepare() {
-  cd linux-$pkgver
-  #patch -N -p1 -i "$srcdir/patch-$pkgver.7"
-  patch -N -p1 -i "$srcdir/02-archlinux-paths.patch"
-  patch -N -p1 -i "$srcdir/04-fix-usip-h-path.patch"
+  local _patch
+  for _patch in patch-$pkgver.? *.patch; do
+    [[ -e "$_patch" ]] || continue
+    msg2 "Applying $_patch"
+    patch -N -p1 -d linux-$pkgver < "$_patch"
+  done
 }
 
 build() {
@@ -118,7 +122,6 @@ package_linux-tools-meta() {
     'cgroup_event_listener'
     'cpupower'
     'libtraceevent'
-    'linux-tools-meta'
     'perf'
     'tmon'
     'usbip'