nvidia-96xx-lts: 96.43.23-5 -> 96.43.23-6: change _kver_ge/_kver_lt to known working version numbers, update PKGBUILD template; nvidia-96xx-ck: 96.43.23-21 -> 96.43.23-21: update PKGBUILD template

Author: 3ed-2nd

nvidia-96xx-ck/PKGBUILD

@@ -3,24 +3,25 @@
 # Contributor: graysky <graysky AT archlnux.us>
 
 pkgname=nvidia-96xx-ck
+_kname=ck
+
 pkgver=96.43.23
 pkgrel=21
 _kver_ge="3.0"
 _kver_lt="3.17"
-pkgdesc="NVIDIA drivers, 96xx branch, for linux-ck."
+pkgdesc="NVIDIA drivers for linux-${_kname}, 96xx branch."
 url="http://www.nvidia.com/"
 arch=('i686' 'x86_64')
-depends=("linux-ck>=${_kver_ge}"
-         "linux-ck<${_kver_lt}"
+depends=("linux-${_kname}>=${_kver_ge}"
+         "linux-${_kname}<${_kver_lt}"
          "nvidia-96xx-utils=${pkgver}")
-makedepends=("linux-ck-headers>=${_kver_ge}"
-             "linux-ck-headers<${_kver_lt}")
+makedepends=("linux-${_kname}-headers>=${_kver_ge}"
+             "linux-${_kname}-headers<${_kver_lt}")
 optdepends=('xorg-server1.12: latest compatible Xorg server')
 provides=('nvidia-96xx')
 conflicts=('nvidia'
            'nvidia-all'
            'nvidia-96xx-all'
-           'nvidia-173xx-all'
            'nvidia-173xx'
            'nvidia-275xx'
            'nvidia-304xx'
@@ -39,7 +40,7 @@ else
 fi
 
 source=(http://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}.run
-        nouveau_blacklist-ck.conf
+        nouveau_blacklist.conf
         173.14.36-37.patch
         173.14.37-38.patch)
 
@@ -50,15 +51,20 @@ sha256sums=('51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142'
 
 [ "$CARCH" = "x86_64" ] && sha256sums[0]='ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64'
 
-_extramodules=$(echo /usr/lib/modules/extramodules-[0-9.]*-ck/version|cut -d/ -f5)
-_kernver=$(cat /usr/lib/modules/${_extramodules}/version)
+_extramodules="$(echo /usr/lib/modules/extramodules-[0-9.]*-${_kname}/version|cut -d/ -f5 2> /dev/null)"
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version 2> /dev/null)"
 
 prepare() {
+  test -n "$_kernver"
+
+  msg2 "Cleaning..."
   test ! -d NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg} \
     || rm -rf NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}
 
+  msg2 "Extracting..."
   sh NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}.run --extract-only
 
+  msg2 "Patching..."
   cd NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}/usr/src/nv
   patch -p1 -i "$srcdir"/173.14.36-37.patch
   patch -p1 -i "$srcdir"/173.14.37-38.patch
@@ -71,7 +77,7 @@ build() {
 
 package() {
   install -dm755 "$pkgdir/etc/modprobe.d"
-  install  -m644 nouveau_blacklist-ck.conf "$pkgdir/etc/modprobe.d/"
+  install -m644 nouveau_blacklist.conf "$pkgdir/etc/modprobe.d/nouveau_blacklist-${_kname}.conf"
 
   cd NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}
   install -dm755 "$pkgdir/usr/share/licenses/${pkgname}/"

nvidia-96xx-ck/nouveau_blacklist-ck.conf nvidia-96xx-ck/nouveau_blacklist.confnvidia-96xx-ck/nouveau_blacklist-ck.conf renamed to nvidia-96xx-ck/nouveau_blacklist.conf

@@ -2,18 +2,21 @@
 # Contributor: Bjoern Franke <bjo@nord-west.org>
 
 pkgname=nvidia-96xx-lts
+_kname=lts
+
 pkgver=96.43.23
-pkgrel=5
-_kver_ge="3.10"
-_kver_lt="3.11"
-pkgdesc="NVIDIA drivers for linux-lts, 96xx branch."
+pkgrel=6
+_kver_ge="3.0"
+_kver_lt="3.17"
+pkgdesc="NVIDIA drivers for linux-${_kname}, 96xx branch."
 url="http://www.nvidia.com/"
 arch=('i686' 'x86_64')
-depends=("linux-lts>=${_kver_ge}"
-         "linux-lts<${_kver_lt}"
-         "nvidia-96xx-utils")
-makedepends=("linux-lts-headers>=${_kver_ge}"
-             "linux-lts-headers<${_kver_lt}")
+depends=("linux-${_kname}>=${_kver_ge}"
+         "linux-${_kname}<${_kver_lt}"
+         "nvidia-96xx-utils=${pkgver}")
+makedepends=("linux-${_kname}-headers>=${_kver_ge}"
+             "linux-${_kname}-headers<${_kver_lt}")
+optdepends=('xorg-server1.12: latest compatible Xorg server')
 provides=('nvidia-96xx')
 conflicts=('nvidia'
            'nvidia-all'
@@ -36,7 +39,7 @@ else
 fi
 
 source=(http://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}.run
-        nouveau_blacklist-lts.conf
+        nouveau_blacklist.conf
         173.14.36-37.patch
         173.14.37-38.patch)
 
@@ -47,15 +50,20 @@ sha256sums=('51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142'
 
 [ "$CARCH" = "x86_64" ] && sha256sums[0]='ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64'
 
-_extramodules=$(echo /usr/lib/modules/extramodules-[0-9.]*-lts/version|cut -d/ -f5)
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+_extramodules="$(echo /usr/lib/modules/extramodules-[0-9.]*-${_kname}/version|cut -d/ -f5 2> /dev/null)"
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version 2> /dev/null)"
 
 prepare() {
+  test -n "$_kernver"
+
+  msg2 "Cleaning..."
   test ! -d NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg} \
     || rm -rf NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}
 
+  msg2 "Extracting..."
   sh NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}.run --extract-only
 
+  msg2 "Patching..."
   cd NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}/usr/src/nv
   patch -p1 -i "$srcdir"/173.14.36-37.patch
   patch -p1 -i "$srcdir"/173.14.37-38.patch
@@ -68,7 +76,7 @@ build() {
 
 package() {
   install -dm755 "$pkgdir/etc/modprobe.d"
-  install -m644 nouveau_blacklist-lts.conf "$pkgdir/etc/modprobe.d/"
+  install -m644 nouveau_blacklist.conf "$pkgdir/etc/modprobe.d/nouveau_blacklist-${_kname}.conf"
 
   cd NVIDIA-Linux-${_arch}-${pkgver}-pkg${_npkg}
   install -dm755 "$pkgdir/usr/share/licenses/${pkgname}/"