[arch-commits] Commit in virtualbox/trunk (4 files)
Christian Hesse
eworm at archlinux.org
Tue May 11 20:09:52 UTC 2021
Date: Tuesday, May 11, 2021 @ 20:09:52
Author: eworm
Revision: 930622
upgpkg: virtualbox 6.1.22-2: drop (and replace) virtualbox-guest-dkms
Modified:
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/virtualbox-guest-dkms.install
virtualbox/trunk/virtualbox-vboxsf-dkms.conf
virtualbox/trunk/virtualbox.install
-------------------------------+
PKGBUILD | 56 +++++++---------------------------------
virtualbox-guest-dkms.install | 12 --------
virtualbox-vboxsf-dkms.conf | 10 -------
virtualbox.install | 12 --------
4 files changed, 11 insertions(+), 79 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-11 20:02:07 UTC (rev 930621)
+++ PKGBUILD 2021-05-11 20:09:52 UTC (rev 930622)
@@ -4,7 +4,6 @@
pkgbase=virtualbox
pkgname=('virtualbox'
'virtualbox-host-dkms'
- 'virtualbox-guest-dkms'
'virtualbox-sdk'
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
@@ -11,8 +10,7 @@
'virtualbox-ext-vnc')
pkgver=6.1.22
_tarver=${pkgver}
-pkgrel=1
-_vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
+pkgrel=2
arch=('x86_64')
url='https://virtualbox.org/'
license=('GPL' 'custom')
@@ -54,11 +52,7 @@
'xorgproto'
'xorg-server-devel')
source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarver}.tar.bz2"
- # We need to build a modified version of vboxsf for Linux 4.16
- # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
- "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit"
'virtualbox-host-dkms.conf'
- 'virtualbox-vboxsf-dkms.conf'
'virtualbox.sysusers'
'virtualbox-guest-utils.sysusers'
'60-vboxdrv.rules'
@@ -79,9 +73,7 @@
'017-fix-narrowing-conversion.patch'
'018-xclient.patch')
sha256sums=('99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49'
- 'SKIP'
'76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
- 'c1ccfaa3a37d6b227cd65de944df2d68cbf178a857b6ab15c04b8fa05693f252'
'2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
'9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
@@ -161,7 +153,6 @@
backup=('etc/vbox/vbox.cfg')
replaces=('virtualbox-ose')
conflicts=('virtualbox-ose')
- install=virtualbox.install
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
@@ -293,45 +284,18 @@
sed -i "s, at VERSION@,$pkgver," "$_p"
}
-package_virtualbox-guest-dkms() {
- pkgdesc='VirtualBox Guest kernel modules sources'
- depends=('dkms' 'gcc' 'make')
- replaces=('virtualbox-archlinux-source'
- 'virtualbox-guest-source'
- 'virtualbox-guest-modules-lts')
- provides=('VIRTUALBOX-GUEST-MODULES')
- conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
- install=virtualbox-guest-dkms.install
-
- install -dm0755 "$pkgdir/usr/src"
- source "VirtualBox-$pkgver/env.sh"
- cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-
- # licence
- install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- # module loading
- local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
- install -Dm0644 /dev/null "$_p"
- printf "vboxguest\nvboxsf\nvboxvideo\n" > "$_p"
-
- # 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"
- echo "obj-m = vboxsf/" >"$pkgdir/usr/src/vboxsf-${pkgver}_OSE/Makefile"
- local _p="$pkgdir/usr/src/vboxsf-${pkgver}_OSE/dkms.conf"
- install -Dm0644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
- sed -i "s, at VERSION@,$pkgver," "$_p"
-}
-
package_virtualbox-guest-utils() {
pkgdesc='VirtualBox Guest userspace utilities'
depends=('glibc' 'pam' 'libx11' 'libxcomposite' 'libxdamage' 'libxext'
'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr' 'xf86-video-vmware'
'VIRTUALBOX-GUEST-MODULES')
- replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
- conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox')
+ replaces=('virtualbox-archlinux-additions'
+ 'virtualbox-guest-additions'
+ 'virtualbox-guest-dkms')
+ conflicts=('virtualbox-archlinux-additions'
+ 'virtualbox-guest-additions'
+ 'virtualbox-guest-utils-nox'
+ 'virtualbox-guest-dkms')
source "VirtualBox-$pkgver/env.sh"
pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
@@ -356,7 +320,9 @@
package_virtualbox-guest-utils-nox() {
pkgdesc='VirtualBox Guest userspace utilities without X support'
depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES')
- conflicts=('virtualbox-guest-utils')
+ replaces=('virtualbox-guest-dkms')
+ conflicts=('virtualbox-guest-utils'
+ 'virtualbox-guest-dkms')
source "VirtualBox-$pkgver/env.sh"
pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
Deleted: virtualbox-guest-dkms.install
===================================================================
--- virtualbox-guest-dkms.install 2021-05-11 20:02:07 UTC (rev 930621)
+++ virtualbox-guest-dkms.install 2021-05-11 20:09:52 UTC (rev 930622)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if (( $(vercmp $2 5.0.16-3) < 0 )); then
- echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by systemd-modules-load.'
- echo '==> Read modules-load.d man page to disable them.'
- fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Deleted: virtualbox-vboxsf-dkms.conf
===================================================================
--- virtualbox-vboxsf-dkms.conf 2021-05-11 20:02:07 UTC (rev 930621)
+++ virtualbox-vboxsf-dkms.conf 2021-05-11 20:09:52 UTC (rev 930622)
@@ -1,10 +0,0 @@
-PACKAGE_NAME="vboxsf"
-PACKAGE_VERSION=@VERSION at _OSE
-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\.[0-5]\..*)"
-
-BUILT_MODULE_NAME[0]="vboxsf"
-BUILT_MODULE_LOCATION[0]="vboxsf"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
Deleted: virtualbox.install
===================================================================
--- virtualbox.install 2021-05-11 20:02:07 UTC (rev 930621)
+++ virtualbox.install 2021-05-11 20:09:52 UTC (rev 930622)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- 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
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
More information about the arch-commits
mailing list