[arch-commits] Commit in virtualbox-modules-arch/trunk (2 files)

[Christian Hesse]

    Date: Thursday, July 6, 2017 @ 09:12:20
  Author: eworm
Revision: 242524

upgpkg: virtualbox-modules-arch 5.1.22-7

* handle linux version with variables
* rebuild for linux 4.12-1

Modified:
  virtualbox-modules-arch/trunk/PKGBUILD
  virtualbox-modules-arch/trunk/virtualbox-modules-arch.install

---------------------------------+
 PKGBUILD                        |   20 +++++++++++++-------
 virtualbox-modules-arch.install |    2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-06 09:00:45 UTC (rev 242523)
+++ PKGBUILD	2017-07-06 09:12:20 UTC (rev 242524)
@@ -5,22 +5,27 @@
 pkgbase=virtualbox-modules-arch
 pkgname=('virtualbox-host-modules-arch' 'virtualbox-guest-modules-arch')
 pkgver=5.1.22
-pkgrel=6
+pkgrel=7
+# remember to also adjust the .install file!
+_linux_major=4
+_linux_minor=12
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux>=4.11' 'linux<4.12'
-             'linux-headers>=4.11' 'linux-headers<4.12'
+makedepends=("linux>=${_linux_major}.${_linux_minor}"
+             "linux<${_linux_major}.$((_linux_minor+1))"
+             "linux-headers>=${_linux_major}.${_linux_minor}"
+             "linux-headers<${_linux_major}.$((_linux_minor+1))"
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver")
 
-# remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-4.11-ARCH
+_extramodules=extramodules-${_linux_major}.${_linux_minor}-ARCH
 
 package_virtualbox-host-modules-arch(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Virtualbox host kernel modules for Arch Kernel'
-  depends=('linux>=4.11' 'linux<4.12')
+  depends=("linux>=${_linux_major}.${_linux_minor}"
+           "linux<${_linux_major}.$((_linux_minor+1))")
   replaces=('virtualbox-modules' 'virtualbox-host-modules')
   conflicts=('virtualbox-modules' 'virtualbox-host-modules'
 			 'virtualbox-host-dkms')
@@ -44,7 +49,8 @@
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Virtualbox guest kernel modules for Arch Kernel'
   license=('GPL')
-  depends=('linux>=4.11' 'linux<4.12')
+  depends=("linux>=${_linux_major}.${_linux_minor}"
+           "linux<${_linux_major}.$((_linux_minor+1))")
   replaces=('virtualbox-archlinux-modules' 'virtualbox-guest-modules')
   conflicts=('virtualbox-archlinux-modules' 'virtualbox-guest-modules'
              'virtualbox-guest-dkms')

Modified: virtualbox-modules-arch.install
===================================================================
--- virtualbox-modules-arch.install	2017-07-06 09:00:45 UTC (rev 242523)
+++ virtualbox-modules-arch.install	2017-07-06 09:12:20 UTC (rev 242524)
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES=extramodules-4.11-ARCH
+  EXTRAMODULES=extramodules-4.12-ARCH
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }