diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-19 03:36:23 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-19 03:36:23 +0000 |
| commit | 322e623017947f32cb26db4c80f8eec2c5736401 (patch) | |
| tree | ea6f3158396b2281984f4ba778c6a06084265afd /libre | |
| parent | 8185891e28635bdb83fdf4ba4391030912dae596 (diff) | |
Wed Feb 19 03:33:04 UTC 2014
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre-tools/02-parabola-paths.patch | 21 | ||||
| -rw-r--r-- | libre/linux-libre-tools/PKGBUILD | 15 |
2 files changed, 30 insertions, 6 deletions
diff --git a/libre/linux-libre-tools/02-parabola-paths.patch b/libre/linux-libre-tools/02-parabola-paths.patch new file mode 100644 index 000000000..223e7d783 --- /dev/null +++ b/libre/linux-libre-tools/02-parabola-paths.patch @@ -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 diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 060d84bf2..c20fee223 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104447 2014-01-21 01:10:56Z seblu $ +# $Id: PKGBUILD 105883 2014-02-17 19:21:42Z seblu $ # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -18,7 +18,7 @@ _basekernel=3.13 #_sublevel=3 #_pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=1 +pkgrel=2 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -41,23 +41,26 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/ 'cpupower.systemd' 'cpupower.service' 'usbipd.service' - '01-fix-perf-python.patch') + '01-fix-perf-python.patch' + '02-parabola-paths.patch') sha256sums=('6e68eef826b17ae9d7df01ac13e46ef5d978670071d1b05aed775bdbff8fed96' #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f' - 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a') + 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a' + 'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570') prepare() { + cd linux-$pkgver # apply stable patching set if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then msg2 'Applying stable patch set' - cd linux-$pkgver patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu - cd .. fi + patch -N -p1 -i "$srcdir/01-fix-perf-python.patch" + patch -N -p1 -i "$srcdir/02-parabola-paths.patch" } build() { |