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

[Evangelos Foutras]

    Date: Saturday, April 7, 2018 @ 20:22:03
  Author: foutrelis
Revision: 314912

upgpkg: virtualbox-modules-arch 5.2.8-14

Switch back to virtualbox-guest-dkms now that it supports Linux 4.16.

Modified:
  virtualbox-modules-arch/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-07 20:16:21 UTC (rev 314911)
+++ PKGBUILD	2018-04-07 20:22:03 UTC (rev 314912)
@@ -5,7 +5,7 @@
 pkgbase=virtualbox-modules-arch
 pkgname=('virtualbox-host-modules-arch' 'virtualbox-guest-modules-arch')
 pkgver=5.2.8
-pkgrel=13
+pkgrel=14
 _linux_major=4
 _linux_minor=16
 arch=('x86_64')
@@ -16,23 +16,10 @@
              "linux-headers>=${_linux_major}.${_linux_minor}"
              "linux-headers<${_linux_major}.$((_linux_minor+1))"
              "virtualbox-host-dkms>=$pkgver"
-             'git')
+             "virtualbox-guest-dkms>=$pkgver")
 
-# We need to build a modified version of vboxsf for Linux 4.16. Once
-# Linux 4.17 is out, we should remove virtualbox-guest-modules-arch.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
-_vboxsf_commit=6a782003ad95a383c8b19b570a532271f090ad35
-source=("git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit")
-sha256sums=('SKIP')
-
 _extramodules=extramodules-${_linux_major}.${_linux_minor}-ARCH
 
-build() {
-  _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
-  cd vboxsf
-  make BUILDDIR=/usr/lib/modules/$_kernver/build
-}
-
 package_virtualbox-host-modules-arch(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Virtualbox host kernel modules for Arch Kernel'
@@ -65,7 +52,8 @@
              'virtualbox-guest-dkms')
   provides=('VIRTUALBOX-GUEST-MODULES')
 
-  install -Dm644 -t "$pkgdir/usr/lib/modules/$_extramodules" vboxsf/vboxsf.ko
+  cd "/var/lib/dkms/vboxsf-4.16/${pkgver}_OSE/$_kernver/$CARCH/module"
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *
 
   # compress each module individually
   find "$pkgdir" -name '*.ko' -exec xz -T1 {} +