[arch-commits] Commit in virtualbox/trunk (3 files)

[Christian Hesse]

    Date: Wednesday, April 1, 2020 @ 12:32:44
  Author: eworm
Revision: 608876

upgpkg: virtualbox 6.1.4-5

clean up dkms stuff

Modified:
  virtualbox/trunk/PKGBUILD
  virtualbox/trunk/virtualbox-vboxsf-dkms.conf
Deleted:
  virtualbox/trunk/virtualbox-guest-dkms.conf

-----------------------------+
 PKGBUILD                    |   14 ++++----------
 virtualbox-guest-dkms.conf  |   34 ----------------------------------
 virtualbox-vboxsf-dkms.conf |    2 +-
 3 files changed, 5 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-01 12:28:32 UTC (rev 608875)
+++ PKGBUILD	2020-04-01 12:32:44 UTC (rev 608876)
@@ -10,7 +10,7 @@
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
 pkgver=6.1.4
-pkgrel=4
+pkgrel=5
 _vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
 arch=('x86_64')
 url='https://virtualbox.org/'
@@ -57,7 +57,6 @@
         # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
         "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit"
         'virtualbox-host-dkms.conf'
-        'virtualbox-guest-dkms.conf'
         'virtualbox-vboxsf-dkms.conf'
         'virtualbox.sysusers'
         'virtualbox-guest-utils.sysusers'
@@ -83,8 +82,7 @@
 sha256sums=('59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99'
             'SKIP'
             '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
-            'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
-            'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b'
+            'c1ccfaa3a37d6b227cd65de944df2d68cbf178a857b6ab15c04b8fa05693f252'
             '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
             'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
             '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
@@ -311,7 +309,7 @@
     install -dm0755 "$pkgdir/usr/src"
     source "VirtualBox-$pkgver/env.sh"
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
+
     # licence
     install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -319,12 +317,8 @@
     local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
     install -Dm0644 /dev/null "$_p"
     printf "vboxguest\nvboxsf\nvboxvideo\n" > "$_p"
-    # starting vbox 5.1, dkms.conf file was dropped
-    local _p="$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf"
-    install -Dm0644 "$srcdir/$pkgname.conf" "$_p"
-    sed -i "s, at VERSION@,$pkgver," "$_p"
 
-    # vboxsf module for Linux 4.16 and later
+    # vboxsf module for Linux 4.16 to Linux 5.5
     install -d "$pkgdir/usr/src/vboxsf-${pkgver}_OSE"
     cp -rT "$srcdir/vboxsf" "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf"
     rm -rf "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf/.git"

Deleted: virtualbox-guest-dkms.conf
===================================================================
--- virtualbox-guest-dkms.conf	2020-04-01 12:28:32 UTC (rev 608875)
+++ virtualbox-guest-dkms.conf	2020-04-01 12:32:44 UTC (rev 608876)
@@ -1,34 +0,0 @@
-## @file
-# Linux DKMS config script for the VirtualBox guest kernel modules
-#
-
-#
-# Copyright (C) 2006-2015 Oracle Corporation
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-PACKAGE_NAME="vboxguest"
-PACKAGE_VERSION=@VERSION at _OSE
-AUTOINSTALL=yes
-
-# Build only for kernels before Linux 4.16
-BUILD_EXCLUSIVE_KERNEL="^(4\.[0-9]\..*|4\.1[0-5]\..*|3\..*)"
-
-BUILT_MODULE_NAME[0]="vboxguest"
-BUILT_MODULE_LOCATION[0]="vboxguest"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
-
-BUILT_MODULE_NAME[1]="vboxsf"
-BUILT_MODULE_LOCATION[1]="vboxsf"
-DEST_MODULE_LOCATION[1]="/kernel/misc"
-
-BUILT_MODULE_NAME[2]="vboxvideo"
-BUILT_MODULE_LOCATION[2]="vboxvideo"
-DEST_MODULE_LOCATION[2]="/kernel/misc"

Modified: virtualbox-vboxsf-dkms.conf
===================================================================
--- virtualbox-vboxsf-dkms.conf	2020-04-01 12:28:32 UTC (rev 608875)
+++ virtualbox-vboxsf-dkms.conf	2020-04-01 12:32:44 UTC (rev 608876)
@@ -3,7 +3,7 @@
 AUTOINSTALL=yes
 
 # Build only for Linux 4.16 and later (until it gets upstreamed...)
-BUILD_EXCLUSIVE_KERNEL="^(4\.(1[6-9]|2[0-9])\..*|5\..*)"
+BUILD_EXCLUSIVE_KERNEL="^(4\.(1[6-9]|2[0-9])\..*|5\.[0-5]\..*)"
 
 BUILT_MODULE_NAME[0]="vboxsf"
 BUILT_MODULE_LOCATION[0]="vboxsf"