[arch-commits] Commit in virtualbox/trunk (4 files)
Sébastien Luttringer
seblu at archlinux.org
Thu Feb 25 10:09:05 UTC 2016
Date: Thursday, February 25, 2016 @ 11:09:04
Author: seblu
Revision: 163393
upgpkg: virtualbox 5.0.14-2
- Drop binary modules packages, use dkms and alpm hooks to build kernel modules.
Modified:
virtualbox/trunk/PKGBUILD
virtualbox/trunk/vboxreload
Deleted:
virtualbox/trunk/virtualbox-guest-dkms.install
virtualbox/trunk/virtualbox-host-dkms.install
-------------------------------+
PKGBUILD | 23 ++++++++---------------
vboxreload | 7 +------
virtualbox-guest-dkms.install | 30 ------------------------------
virtualbox-host-dkms.install | 34 ----------------------------------
4 files changed, 9 insertions(+), 85 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-25 10:06:15 UTC (rev 163392)
+++ PKGBUILD 2016-02-25 10:09:04 UTC (rev 163393)
@@ -11,7 +11,7 @@
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
pkgver=5.0.14
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -75,7 +75,7 @@
'8ba9179c4a3516904417d773816dd992'
'fcf6bcef98b16849d5c9f048592739c0'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
- '44a8e105517a1e04769b50469a87bdcb'
+ 'fd3d988c83d33add042544fa9a281923'
'9be7e2703afeee1fca9368bd8750e710'
'9e49bbaa2192b141c27ee43cef8cbab7'
'ecfd13297d7753ebe7b8763ca5b792d9'
@@ -131,13 +131,12 @@
depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python2' 'sdl'
'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib'
'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt'
- 'virtualbox-host-modules')
+ 'virtualbox-host-dkms')
optdepends=('qt4: GUI support'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-guest-iso: Guest Additions CD image'
'virtualbox-ext-vnc: VNC server support'
'virtualbox-sdk: Developer kit'
- 'virtualbox-host-dkms: Build kernel modules with DKMS'
'net-tools: Host-only or bridged networking support')
backup=('etc/vbox/vbox.cfg')
replaces=('virtualbox-ose')
@@ -239,7 +238,7 @@
VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
popd
rm -rf sdk/installer
- mv sdk "$pkgdir/usr/lib/virtualbox"
+ cp -r sdk "$pkgdir/usr/lib/virtualbox"
# licence
install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -248,17 +247,15 @@
package_virtualbox-host-dkms() {
pkgdesc='VirtualBox Host kernel modules sources'
depends=('dkms' 'gcc' 'make')
- provides=('virtualbox-host-modules')
replaces=('virtualbox-source' 'virtualbox-host-source')
conflicts=('virtualbox-source' 'virtualbox-host-source')
optdepends=('linux-headers'
'linux-lts-headers')
- install=virtualbox-host-dkms.install
install -dm755 "$pkgdir/usr/src"
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
+ cp -r src "$pkgdir/usr/src/vboxhost-${pkgver}_OSE"
# licence
install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -267,17 +264,15 @@
package_virtualbox-guest-dkms() {
pkgdesc='VirtualBox Guest kernel modules sources'
depends=('dkms' 'gcc' 'make')
- provides=('virtualbox-guest-modules')
replaces=('virtualbox-archlinux-source' 'virtualbox-guest-source')
conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
optdepends=('linux-headers'
'linux-lts-headers')
- install=virtualbox-guest-dkms.install
install -dm755 "$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"
+ cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
# licence
install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -285,10 +280,9 @@
package_virtualbox-guest-utils() {
pkgdesc='VirtualBox Guest userspace utilities'
- depends=('virtualbox-guest-modules' 'glibc' 'pam' 'libx11' 'libxcomposite'
+ depends=('virtualbox-guest-dkms' 'glibc' 'pam' 'libx11' 'libxcomposite'
'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr'
'X-ABI-VIDEODRV_VERSION=20')
- optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels')
replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox')
install=virtualbox-guest-utils.install
@@ -318,8 +312,7 @@
package_virtualbox-guest-utils-nox() {
pkgdesc='VirtualBox Guest userspace utilities without X support'
- depends=('virtualbox-guest-modules' 'glibc' 'pam')
- optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels')
+ depends=('virtualbox-guest-dkms' 'glibc' 'pam')
conflicts=('virtualbox-guest-utils')
install=virtualbox-guest-utils.install
Modified: vboxreload
===================================================================
--- vboxreload 2016-02-25 10:06:15 UTC (rev 163392)
+++ vboxreload 2016-02-25 10:09:04 UTC (rev 163393)
@@ -2,7 +2,7 @@
# vboxreload: shortcut to reload virtualbox modules with DKMS support
#
-# Copyright © 2013 Sébastien Luttringer
+# Copyright © 2016 Sébastien Luttringer
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -28,11 +28,6 @@
done
echo
-if type -P dkms >/dev/null; then
- echo 'DKMS autoinstall'
- dkms autoinstall
-fi
-
echo -n 'Loading modules: '
for _m in "${modules[@]}"; do
modprobe "$_m" && echo -n "$_m "
Deleted: virtualbox-guest-dkms.install
===================================================================
--- virtualbox-guest-dkms.install 2016-02-25 10:06:15 UTC (rev 163392)
+++ virtualbox-guest-dkms.install 2016-02-25 10:09:04 UTC (rev 163393)
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# arg 1: the new package version
-post_install() {
- dkms add vboxguest/${1%-*}
- cat << EOF
-==> To build and install your modules run: dkms install vboxguest/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-pre_upgrade() {
- pre_remove "$2"
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install "$1"
-}
-
-# arg 1: the old package version
-pre_remove() {
- # Remove modules using dkms
- [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all &>/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Deleted: virtualbox-host-dkms.install
===================================================================
--- virtualbox-host-dkms.install 2016-02-25 10:06:15 UTC (rev 163392)
+++ virtualbox-host-dkms.install 2016-02-25 10:09:04 UTC (rev 163393)
@@ -1,34 +0,0 @@
-#/bin/sh
-
-# arg 1: the new package version
-post_install() {
- dkms add vboxhost/${1%-*}
- cat << EOF
-==> To build and install your modules run: dkms install vboxhost/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-pre_upgrade() {
- pre_remove "$2"
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- dkms add vboxhost/${1%-*}
- cat << EOF
-==> Remember to upgrade your running modules
-==> You can do this running vboxreload command as root
-EOF
-}
-
-# arg 1: the old package version
-pre_remove() {
- # Remove modules using dkms
- [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all &>/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
More information about the arch-commits
mailing list