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

[Jan Steffens]

    Date: Tuesday, June 5, 2018 @ 20:12:30
  Author: heftig
Revision: 340621

simplify

Modified:
  virtualbox-modules-arch/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-05 20:09:31 UTC (rev 340620)
+++ PKGBUILD	2018-06-05 20:12:30 UTC (rev 340621)
@@ -11,10 +11,10 @@
 arch=('x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-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))"
+_linux_cur=${_linux_major}.${_linux_minor}
+_linux_next=${_linux_major}.$((_linux_minor + 1))
+makedepends=("linux>=$_linux_cur" "linux<$_linux_next"
+             "linux-headers>=$_linux_cur" "linux-headers<$_linux_next"
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver")
 
@@ -23,8 +23,7 @@
 package_virtualbox-host-modules-arch(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Virtualbox host kernel modules for Arch Kernel'
-  depends=("linux>=${_linux_major}.${_linux_minor}"
-           "linux<${_linux_major}.$((_linux_minor+1))")
+  depends=("linux>=$_linux_cur" "linux<$_linux_next")
   replaces=('virtualbox-modules' 'virtualbox-host-modules')
   conflicts=('virtualbox-modules' 'virtualbox-host-modules'
 			 'virtualbox-host-dkms')
@@ -37,7 +36,7 @@
   find "$pkgdir" -name '*.ko' -exec xz -T1 {} +
 
   # systemd module loading
-  printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" |
+  printf '%s\n' vboxdrv vboxpci vboxnetadp vboxnetflt |
     install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 }
 
@@ -45,8 +44,7 @@
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Virtualbox guest kernel modules for Arch Kernel'
   license=('GPL')
-  depends=("linux>=${_linux_major}.${_linux_minor}"
-           "linux<${_linux_major}.$((_linux_minor+1))")
+  depends=("linux>=$_linux_cur" "linux<$_linux_next")
   replaces=('virtualbox-archlinux-modules' 'virtualbox-guest-modules')
   conflicts=('virtualbox-archlinux-modules' 'virtualbox-guest-modules'
              'virtualbox-guest-dkms')