Bump to 6.1.12 and rework build to avoid compiling the GAs

1 files changed, 7 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b0c52e2ad151..8b743ad022f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: William Turner <willtur.will@gmail.com>
 
 pkgname=virtualbox-guest-dkms-vmsvga
-pkgver=6.1.10
-pkgrel=4
+pkgver=6.1.12
+pkgrel=1
 pkgdesc='VirtualBox Guest kernel modules sources (VMSVGA resize and multi-head fix)'
 arch=('x86_64')
 url='https://virtualbox.org/'
@@ -16,21 +16,12 @@ conflicts=('virtualbox-archlinux-source'
            'virtualbox-guest-dkms'
            'virtualbox-guest-source')
 source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2"
-        'LocalConfig.kmk'
         'vboxvmsvga.desktop'
         'virtualbox-guest-dkms-vmsvga.conf')
-sha256sums=('37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477'
-            '2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a'
+sha256sums=('05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362'
             '4404a95eb6f5c30683625e870fe7a26e562200c2220728d0c14151dbf9667e36'
             'edd0492f0706e03169cdf3654658ea650687c30967ca5e32fde19d43e3dd4e5e')
 
-prepare() {
-  cd "VirtualBox-$pkgver"
-
-  cp "$srcdir/LocalConfig.kmk" .
-  echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk
-}
-
 build() {
   cd "VirtualBox-$pkgver"
 
@@ -39,18 +30,15 @@ build() {
     --only-additions \
     --disable-kmods \
     --with-makeself=/usr/bin/echo
-
-  source ./env.sh
-  kmk
 }
 
 package() {
-  source "VirtualBox-$pkgver/env.sh"
-  cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+  cd "VirtualBox-$pkgver"
+
+  source ./env.sh
 
   # dkms modules
-  install -d -m0755 "$pkgdir/usr/src"
-  cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
+  src/VBox/Additions/linux/export_modules.sh --folder "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
   echo 'obj-m = vboxguest/ vboxsf/ vboxvideo/' > "$pkgdir/usr/src/vboxguest-${pkgver}_OSE/Makefile"
   sed "s/@VERSION@/$pkgver/" "$srcdir/$pkgname.conf" > "$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf"