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

[Sébastien Luttringer]

    Date: Saturday, March 12, 2016 @ 19:50:54
  Author: seblu
Revision: 166426

upgpkg: virtualbox 5.0.16-1

- load kernel modules via systemd-modules-load
- add others kernels in makedepends and a better description
- fix FS#48523
- display a message that we have moved modules to dkms (still in discutions in a-d-p at al.org)
- vbox-*-dkms: temporary pull linux-headers until FS#48498

Modified:
  virtualbox/trunk/PKGBUILD
  virtualbox/trunk/virtualbox.install

--------------------+
 PKGBUILD           |   42 +++++++++++++++++++++++++++++++-----------
 virtualbox.install |    4 ++++
 2 files changed, 35 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-12 18:48:09 UTC (rev 166425)
+++ PKGBUILD	2016-03-12 18:50:54 UTC (rev 166426)
@@ -10,8 +10,8 @@
          'virtualbox-guest-utils'
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
-pkgver=5.0.14
-pkgrel=4
+pkgver=5.0.16
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -66,7 +66,7 @@
         '007-python2-path.patch'
         '010-no-update.patch'
         )
-md5sums=('e0a02426ad09b475e630881efe911423'
+md5sums=('1752a485b1cb377cee5f196918cda741'
          '984412a63aa9c07ddc3cfd970381d5df'
          '4833c8e0524fd2272b24ba0d94aef006'
          '6e2722bfd7013c1b0174382626ac1b8d'
@@ -246,11 +246,16 @@
 
 package_virtualbox-host-dkms() {
     pkgdesc='VirtualBox Host kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    replaces=('virtualbox-source' 'virtualbox-host-source' 'virtualbox-host-modules')
+    depends=('dkms' 'gcc' 'make' 'linux-headers')
+    replaces=('virtualbox-source'
+              'virtualbox-host-source'
+              'virtualbox-host-modules'
+              'virtualbox-host-modules-lts')
     conflicts=('virtualbox-source' 'virtualbox-host-source')
-    optdepends=('linux-headers'
-                'linux-lts-headers')
+    optdepends=('linux-headers: build modules against Arch kernel'
+                'linux-lts-headers: build modules against LTS Arch kernel'
+                'linux-zen-headers: build modules against ZEN Arch kernel'
+                'linux-grsec-headers: build modules against GRSEC Arch kernel')
 
     install -dm755 "$pkgdir/usr/src"
     source "VirtualBox-$pkgver/env.sh"
@@ -259,15 +264,25 @@
     # licence
     install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    # module loading
+    install -Dm644 /dev/null \
+        "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+    echo "vboxnetadp\nvboxnetflt\nvboxdrv\n" > \
+        "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 }
 
 package_virtualbox-guest-dkms() {
     pkgdesc='VirtualBox Guest kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    replaces=('virtualbox-archlinux-source' 'virtualbox-guest-source' 'virtualbox-guest-modules')
+    depends=('dkms' 'gcc' 'make' 'linux-headers')
+    replaces=('virtualbox-archlinux-source'
+              'virtualbox-guest-source'
+              'virtualbox-guest-modules'
+              'virtualbox-guest-modules-lts')
     conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
-    optdepends=('linux-headers'
-                'linux-lts-headers')
+    optdepends=('linux-headers: build modules against Arch kernel'
+                'linux-lts-headers: build modules against LTS Arch kernel'
+                'linux-zen-headers: build modules against ZEN Arch kernel'
+                'linux-grsec-headers: build modules against GRSEC Arch kernel')
 
     install -dm755 "$pkgdir/usr/src"
     source "VirtualBox-$pkgver/env.sh"
@@ -276,6 +291,11 @@
     # licence
     install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    # module loading
+    install -Dm644 /dev/null \
+        "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+    echo "vboxnetadp\nvboxsf\nvboxguest\n" > \
+        "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 }
 
 package_virtualbox-guest-utils() {

Modified: virtualbox.install
===================================================================
--- virtualbox.install	2016-03-12 18:48:09 UTC (rev 166425)
+++ virtualbox.install	2016-03-12 18:50:54 UTC (rev 166426)
@@ -28,6 +28,10 @@
 # arg 2:  the old package version
 post_upgrade() {
   post_install "$1"
+  if (( $(vercmp $2 5.0.16-1) < 0 )); then
+    echo '==> Since version 5.0.14-2 kernel modules are provided via dkms'
+    echo '==> Check you have the headers matching your kernel installed'
+  fi
 }
 
 # arg 1:  the old package version