add modifications from coadde and lukeshu contributions for linux-libre* and dependencies

1 files changed, 20 insertions, 16 deletions

diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 245282994..07a973f1c 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,54 +1,58 @@
 # $Id: PKGBUILD 211667 2014-04-23 02:10:08Z allan $
 # Maintainer (Arch): Allan McRae <allan@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-libre-api-headers
-_basekernel=3.14
-_sublevel=1
-pkgver=${_basekernel}.${_sublevel}
+_pkgbasever=3.14-gnu
+_pkgver=3.14.1-gnu
+
+_srcname=linux-${_pkgbasever%-*}
+pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
-provides=("linux-api-headers=${pkgver}")
+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"
+replaces=( 'linux-api-headers')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
         linux-3.14-xattr_header.patch)
 md5sums=('c108ec52eeb2a9b9ddbb8d12496ff25f'
          '2b4862b3c76011e66e536f18fbf0fb27'
          '22926521588b2e95f3c2a2cb428e7cf9')
 
 prepare() {
-  cd ${srcdir}/linux-${_basekernel}
+  cd "${srcdir}/${_srcname}"
 
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -p1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  # add upstream patch
+  if [ "${_pkgbasever}" != "${_pkgver}" ]; then
+    patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}"
   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
+  patch -p1 -i "$srcdir"/linux-3.14-xattr_header.patch
 }
 
 build() {
-  cd ${srcdir}/linux-${_basekernel}
+  cd "${srcdir}/${_srcname}"
 
   make mrproper
   make headers_check
 }
 
 package() {
-  cd ${srcdir}/linux-${_basekernel}
-  make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
+  cd "${srcdir}/${_srcname}"
+  make INSTALL_HDR_PATH="${pkgdir}"/usr headers_install
 
   # use headers from libdrm
-  rm -r ${pkgdir}/usr/include/drm
+  rm -r "${pkgdir}"/usr/include/drm
   
   # clean-up unnecessary files generated during install
-  find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
+  find "${pkgdir}" \( -name .install -o -name ..install.cmd \) -delete
 }