[arch-commits] Commit in linux-tools/trunk (02-archlinux-paths.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Monday, February 17, 2014 @ 20:21:42
  Author: seblu
Revision: 105883

upgpkg: linux-tools 3.13-2

- fix libprefix (reported by heftig)

Added:
  linux-tools/trunk/02-archlinux-paths.patch
Modified:
  linux-tools/trunk/PKGBUILD

--------------------------+
 02-archlinux-paths.patch |   21 +++++++++++++++++++++
 PKGBUILD                 |   14 +++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

Added: 02-archlinux-paths.patch
===================================================================
--- 02-archlinux-paths.patch	                        (rev 0)
+++ 02-archlinux-paths.patch	2014-02-17 19:21:42 UTC (rev 105883)
@@ -0,0 +1,21 @@
+# Seblu was here
+--- a/tools/perf/config/Makefile	2014-02-13 23:00:14.000000000 +0100
++++ b/tools/perf/config/Makefile	2014-02-17 20:01:33.370539725 +0100
+@@ -561,7 +561,7 @@
+ bindir = $(prefix)/$(bindir_relative)
+ mandir = share/man
+ infodir = share/info
+-perfexecdir = libexec/perf-core
++perfexecdir = lib/perf
+ sharedir = $(prefix)/share
+ template_dir = share/perf-core/templates
+ htmldir = share/doc/perf-doc
+@@ -573,7 +573,7 @@
+ ETC_PERFCONFIG = etc/perfconfig
+ endif
+ ifeq ($(IS_X86_64),1)
+-lib = lib64
++lib = lib
+ else
+ lib = lib
+ endif

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-17 19:03:35 UTC (rev 105882)
+++ PKGBUILD	2014-02-17 19:21:42 UTC (rev 105883)
@@ -14,7 +14,7 @@
   'x86_energy_perf_policy'
 )
 pkgver=3.13
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -32,24 +32,28 @@
 makedepends+=('ncurses')
 groups=("$pkgbase")
 source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz"
-        #"http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz"
+        "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz"
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service'
-        '01-fix-perf-python.patch')
+        '01-fix-perf-python.patch'
+        '02-archlinux-paths.patch')
 # http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
 sha256sums=('4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2'
+            '6d54f1dcd4d9441644a7ef4445f6633158e666fddaa6f06bb6656ab2ff4509d4'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
-            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a')
+            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a'
+            'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570')
 
 prepare() {
   cd linux-$pkgver
-  #patch -N -p1 -i "$srcdir/patch-$pkgver.5"
+  patch -N -p1 -i "$srcdir/patch-$pkgver.3"
   patch -N -p1 -i "$srcdir/01-fix-perf-python.patch"
+  patch -N -p1 -i "$srcdir/02-archlinux-paths.patch"
 }
 
 build() {