Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

1 files changed, 17 insertions, 7 deletions

diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 087a0cae8..07cfe7988 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 205569 2014-02-07 22:36:57Z allan $
+# $Id: PKGBUILD 211667 2014-04-23 02:10:08Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-libre-api-headers
-_basekernel=3.13
-_sublevel=2
+_basekernel=3.14
+_sublevel=1
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
@@ -17,17 +17,27 @@ provides=("linux-api-headers=${pkgver}")
 conflicts=('linux-api-headers')
 replaces=('linux-api-headers')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
-md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
-         '5594978ab8b62033274cf36305baf238')
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        linux-3.14-xattr_header.patch)
+md5sums=('c108ec52eeb2a9b9ddbb8d12496ff25f'
+         '2b4862b3c76011e66e536f18fbf0fb27'
+         '22926521588b2e95f3c2a2cb428e7cf9')
 
-build() {
+prepare() {
   cd ${srcdir}/linux-${_basekernel}
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
     patch -p1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
+  # fix xattr.h dual inclusion issues
+  # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=ea1a8217
+  patch -p1 -i $srcdir/linux-3.14-xattr_header.patch
+}
+
+build() {
+  cd ${srcdir}/linux-${_basekernel}
+
   make mrproper
   make headers_check
 }