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

[Jan Steffens]

    Date: Friday, October 11, 2019 @ 19:19:34
  Author: heftig
Revision: 515100

6.0.12-13: kernel 5.3.6.arch1-1; removal of extramodules-ARCH

Modified:
  virtualbox-modules-arch/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-11 19:19:32 UTC (rev 515099)
+++ PKGBUILD	2019-10-11 19:19:34 UTC (rev 515100)
@@ -4,7 +4,7 @@
 pkgbase=virtualbox-modules-arch
 pkgname=('virtualbox-host-modules-arch' 'virtualbox-guest-modules-arch')
 pkgver=6.0.12
-pkgrel=12
+pkgrel=13
 arch=('x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -13,10 +13,8 @@
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver")
 
-_extramodules=extramodules-ARCH
-
 package_virtualbox-host-modules-arch(){
-  _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+  _kernver="$(</usr/src/linux/version)"
   pkgdesc='Virtualbox host kernel modules for Arch Kernel'
   replaces=('virtualbox-modules' 'virtualbox-host-modules')
   conflicts=('virtualbox-modules' 'virtualbox-host-modules'
@@ -24,7 +22,7 @@
   provides=('VIRTUALBOX-HOST-MODULES')
 
   cd "/var/lib/dkms/vboxhost/${pkgver}_OSE/$_kernver/$CARCH/module"
-  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m0644 *
+  install -Dt "$pkgdir/usr/lib/modules/$_kernver/extramodules" -m0644 *
 
   # compress each module individually
   find "$pkgdir" -name '*.ko' -exec xz -T1 {} +
@@ -35,7 +33,7 @@
 }
 
 package_virtualbox-guest-modules-arch(){
-  _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+  _kernver="$(</usr/src/linux/version)"
   pkgdesc='Virtualbox guest kernel modules for Arch Kernel'
   replaces=('virtualbox-archlinux-modules' 'virtualbox-guest-modules')
   conflicts=('virtualbox-archlinux-modules' 'virtualbox-guest-modules'
@@ -43,7 +41,7 @@
   provides=('VIRTUALBOX-GUEST-MODULES')
 
   cd "/var/lib/dkms/vboxsf/${pkgver}_OSE/$_kernver/$CARCH/module"
-  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m0644 *
+  install -Dt "$pkgdir/usr/lib/modules/$_kernver/extramodules" -m0644 *
 
   # compress each module individually
   find "$pkgdir" -name '*.ko' -exec xz -T1 {} +