Revert dependency change from lts and move to kernel version

This change relates to the new package nvidia-vulkan-developer-beta-lts
that installs the driver for the lts kernel. The current 4.10 kernel
from Arch is not yet supported - only the latest NVIDIA drivers have
received patches.

3 files changed, 13 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38b0c02b7794..3169ced2daf5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = nvidia-vulkan-developer-beta
 	pkgdesc = NVIDIA driver for Arch's official 'linux' package (vulkan developer beta version)
 	pkgver = 375.27.14
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.nvidia.com/
 	install = nvidia-vulkan-developer-beta.install
 	arch = i686
 	arch = x86_64
 	license = custom:NVIDIA
-	makedepends = linux-lts-headers
-	depends = linux-lts
+	makedepends = linux-headers<4.10
+	depends = linux<4.10
 	depends = nvidia-utils-vulkan-developer-beta>=375.27.14
 	depends = libgl
 	provides = nvidia=375.27.14
diff --git a/PKGBUILD b/PKGBUILD
index f3a1f3314412..3badaa3beeb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
 
 pkgname=nvidia-vulkan-developer-beta
 pkgver=375.27.14
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA driver for Arch's official 'linux' package (vulkan developer beta version)"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom:NVIDIA')
-depends=('linux-lts' "nvidia-utils-vulkan-developer-beta>=$pkgver" 'libgl')
-makedepends=('linux-lts-headers')
+depends=('linux<4.10' "nvidia-utils-vulkan-developer-beta>=$pkgver" 'libgl')
+makedepends=('linux-headers<4.10')
 provides=("nvidia=$pkgver")
 conflicts=('nvidia-96xx' 'nvidia-173xx' 'nvidia')
 options=('!strip')
@@ -18,12 +18,11 @@ install=$pkgname.install
 
 # Installer name
 case "$CARCH" in
-  i686)   _pkg="linux-3752714-32-bit"; _pkg_dir="NVIDIA-Linux-x86_64-$pkgver" ;;
+  i686)   _pkg="linux-375271432bit"; _pkg_dir="NVIDIA-Linux-x86_64-$pkgver" ;;
   x86_64) _pkg="linux-3752714-64-bit"; _pkg_dir="NVIDIA-Linux-x86_64-$pkgver" ;;
 esac
 
 # Source
-#source=('linux-4.8.patch')
 source_i686=("https://developer.nvidia.com/linux-3752714-32-bit")
 source_x86_64=("https://developer.nvidia.com/linux-3752714-64-bit")
 md5sums_i686=('9f97042234b2ca4d4b63c3ddc384b4a7')
@@ -52,7 +51,7 @@ prepare() {
   # Loop patches
   for _patch in $(ls "$srcdir"/*.patch 2>/dev/null); do
     # Version variables
-    _kernel=$(cat /usr/lib/modules/extramodules-*-lts/version)
+    _kernel=$(cat /usr/lib/modules/extramodules-*-ARCH/version)
     _major_patch=$(echo $_patch | grep -Po "\d+\.\d+")
       
     # Check version
@@ -65,8 +64,8 @@ prepare() {
 
 build() {
   # Version of 'linux'
-  _major=$(pacman -Q linux-lts | grep -Po "\d+\.\d+")
-  _extramodules=extramodules-$_major-lts
+  _major=$(pacman -Q linux | grep -Po "\d+\.\d+")
+  _extramodules=extramodules-$_major-ARCH
   _kernel=$(cat /usr/lib/modules/$_extramodules/version)
 
   # Build module
@@ -77,8 +76,8 @@ build() {
 
 package() {
   # Version of 'linux'
-  _major=$(pacman -Q linux-lts | grep -Po "\d+\.\d+")
-  _extramodules=extramodules-$_major-lts
+  _major=$(pacman -Q linux | grep -Po "\d+\.\d+")
+  _extramodules=extramodules-$_major-ARCH
 
   # Install
   install -Dm644 $_pkg_dir/kernel/nvidia.ko \
diff --git a/nvidia-vulkan-developer-beta.install b/nvidia-vulkan-developer-beta.install
index d5a410a07e9b..dc3e61ee41af 100644
--- a/nvidia-vulkan-developer-beta.install
+++ b/nvidia-vulkan-developer-beta.install
@@ -1,5 +1,5 @@
 _depmod() {
-    _extramodules='extramodules-4.9-lts'
+    _extramodules='extramodules-4.9-ARCH'
 
     # Update module dependencies
     depmod $(cat /usr/lib/modules/$_extramodules/version)