Date: Sunday, October 9, 2016 @ 13:51:59 Author: seblu Revision: 191703
upgpkg: linux-tools 4.8-1 Modified: linux-tools/trunk/PKGBUILD Deleted: linux-tools/trunk/02-archlinux-paths.patch linux-tools/trunk/04-fix-usip-h-path.patch --------------------------+ 02-archlinux-paths.patch | 21 --------------------- 04-fix-usip-h-path.patch | 13 ------------- PKGBUILD | 32 +++++++++++++++----------------- 3 files changed, 15 insertions(+), 51 deletions(-) Deleted: 02-archlinux-paths.patch =================================================================== --- 02-archlinux-paths.patch 2016-10-09 13:00:31 UTC (rev 191702) +++ 02-archlinux-paths.patch 2016-10-09 13:51:59 UTC (rev 191703) @@ -1,21 +0,0 @@ -# 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 ($(ARCH)$(IS_64_BIT), x861) --lib = lib64 -+lib = lib - else - lib = lib - endif Deleted: 04-fix-usip-h-path.patch =================================================================== --- 04-fix-usip-h-path.patch 2016-10-09 13:00:31 UTC (rev 191702) +++ 04-fix-usip-h-path.patch 2016-10-09 13:51:59 UTC (rev 191703) @@ -1,13 +0,0 @@ -# Copyright 2014 Sébastien Luttringer - ---- a/tools/usb/usbip/libsrc/usbip_common.h 2014-10-06 02:13:09.295856364 +0200 -+++ b/tools/usb/usbip/libsrc/usbip_common.h 2014-10-06 02:13:03.607873728 +0200 -@@ -15,7 +15,7 @@ - #include <syslog.h> - #include <unistd.h> - #include <linux/usb/ch9.h> --#include <linux/usbip.h> -+#include "../../../include/uapi/linux/usbip.h" - - #ifndef USBIDS_FILE - #define USBIDS_FILE "/usr/share/hwdata/usb.ids" Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-10-09 13:00:31 UTC (rev 191702) +++ PKGBUILD 2016-10-09 13:51:59 UTC (rev 191703) @@ -13,8 +13,8 @@ 'usbip' 'x86_energy_perf_policy' ) -pkgver=4.7 -pkgrel=3 +pkgver=4.8 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -33,28 +33,23 @@ makedepends+=('ncurses') groups=("$pkgbase") source=("git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v$pkgver" - 'https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-4.7.5.xz' + #'https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-4.7.5.xz' 'cpupower.default' 'cpupower.systemd' 'cpupower.service' 'usbipd.service' - '01-cpupower-governor-fix.patch' - '02-archlinux-paths.patch' - '04-fix-usip-h-path.patch') + '01-cpupower-governor-fix.patch') md5sums=('SKIP' - 'c5f3473be15411f7b02f36b7f52cc9d1' '56883c159381ba89e50ab8ea65efec77' '34f5ecc19770a1abbcd0fd65bfd1f065' '86c4e419e4ba80835c330d49ba3f56ad' 'bb35634f480325a78b943f7e10165e86' - '33c871519adfd4e5575643c4579d019b' - '1bc4f8c7a21a30e1a873d07e69fb698b' - 'a73ea3ea6d9c9ecb1cc910871eead3ff') + '33c871519adfd4e5575643c4579d019b') prepare() { cd linux # apply stable kernel patch - patch -p1 -N -i "$srcdir"/patch-4.7.5 + #patch -p1 -N -i "$srcdir"/patch-4.7.5 # apply patch from the source array (should be a pacman feature) local filename for filename in "${source[@]}"; do @@ -74,10 +69,11 @@ msg2 'perf' pushd linux/tools/perf - make \ + make -f Makefile.perf \ prefix=/usr \ - DESTDIR="$pkgdir" \ - WERROR=0 \ + lib=lib/perf \ + perfexecdir=lib/perf \ + NO_SDT=1 \ PYTHON=python2 \ PYTHON_CONFIG=python2-config \ PERF_VERSION=$pkgver-$pkgrel \ @@ -153,13 +149,15 @@ optdepends=('gtk2: support GTK2 browser for perf report') cd linux/tools/perf - make \ + make -f Makefile.perf \ prefix=/usr \ - DESTDIR="$pkgdir" \ - WERROR=0 \ + lib=lib/perf \ + perfexecdir=lib/perf \ + NO_SDT=1 \ PYTHON=python2 \ PYTHON_CONFIG=python2-config \ PERF_VERSION=$pkgver-$pkgrel \ + DESTDIR="$pkgdir" \ install install-man cd "$pkgdir" # move completion in new directory