diff options
| -rw-r--r-- | libre/virtualbox-libre/003-linux-3.8.patch | 15 | ||||
| -rw-r--r-- | libre/virtualbox-libre/PKGBUILD | 32 | ||||
| -rw-r--r-- | libre/virtualbox-libre/vboxservice.conf | 2 | ||||
| -rw-r--r-- | libre/virtualbox-libre/vboxservice.rc | 39 | ||||
| -rw-r--r-- | libre/virtualbox-libre/vboxweb.conf | 11 | ||||
| -rw-r--r-- | libre/virtualbox-libre/vboxweb.rc | 86 | ||||
| -rw-r--r-- | libre/virtualbox-libre/virtualbox-libre-guest-dkms.install | 4 | ||||
| -rw-r--r-- | libre/virtualbox-libre/virtualbox-libre-host-dkms.install | 4 | ||||
| -rw-r--r-- | libre/virtualbox-libre/virtualbox-libre.install | 6 |
9 files changed, 27 insertions, 172 deletions
diff --git a/libre/virtualbox-libre/003-linux-3.8.patch b/libre/virtualbox-libre/003-linux-3.8.patch new file mode 100644 index 000000000..0c6d9fbbf --- /dev/null +++ b/libre/virtualbox-libre/003-linux-3.8.patch @@ -0,0 +1,15 @@ +--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (revision 43343) ++++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (revision 44317) +@@ -196,7 +196,11 @@ + + + /** PCI hotplug structure. */ +-static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] = ++static const struct pci_device_id ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) ++__devinitdata ++#endif ++g_VBoxGuestPciId[] = + { + { + vendor: VMMDEV_VENDORID, diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index dc94a2a33..8f16e1ab9 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') pkgver=4.2.6 -pkgrel=1.1 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -39,7 +39,7 @@ makedepends=('alsa-lib' 'mesa' 'glu' 'python2' - 'qt' + 'qt4' 'sdl' 'sdl_ttf' 'vde2' @@ -49,14 +49,11 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta '10-vboxdrv.rules' '60-vboxguest.rules' 'LocalConfig.kmk' - 'vboxservice.conf' - 'vboxservice.rc' 'vboxservice.service' - 'vboxweb.conf' - 'vboxweb.rc' 'vboxweb.service' '001-vboxdrv-reference.patch' '002-change_default_driver_dir.patch' + '003-linux-3.8.patch' 'os_blag_64.png' 'os_blag.png' 'os_dragora_64.png' @@ -81,14 +78,11 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' - '3c08ad30b89add47d3f45121200a5360' - '7d9823507206de9b8528a72af2f18d74' '07c5f6d86c4b7839d719c8ee0c53653b' - '7e9483b1069a54f181546083ac7e5469' - 'c159d683ba1947290fc2ad2c64194150' 'bc9efed88e0469cd7fc460d5a5cd7b4b' 'f4e4c7895ede9c524109589bf16ae660' '97e193f050574dd272a38e5ee5ebe62b' + 'e565ff0d028776d4f48e6e5b4d0b48e0' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' 'f6416f509c2e5460e4dc624e0a57f3c1' @@ -166,7 +160,7 @@ build() { } package_virtualbox-libre() { - pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)' + pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets included and Oracle VM VirtualBox Extension Pack support removed)' depends=('curl' 'libpng' 'libxcursor' @@ -176,12 +170,12 @@ package_virtualbox-libre() { 'sdl' 'shared-mime-info' 'virtualbox-libre-host-modules') - optdepends=('qt: VirtualBox GUI support' + optdepends=('qt4: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: Developer kit' 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels' 'net-tools: Host-only or bridged networking support') - backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') + backup=('etc/vbox/vbox.cfg') replaces=('virtualbox' 'virtualbox-ose') conflicts=('virtualbox' 'virtualbox-ose') provides=("virtualbox=$pkgver") @@ -247,14 +241,9 @@ package_virtualbox-libre() { install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules" - # install rc.d script - install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb" # install systemd service install -D -m644 "$srcdir/vboxweb.service" \ "$pkgdir/usr/lib/systemd/system/vboxweb.service" - # install sample config - install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb" - } package_virtualbox-libre-sdk() { @@ -313,11 +302,10 @@ package_virtualbox-libre-guest-dkms() { package_virtualbox-libre-guest-utils(){ pkgdesc='VirtualBox Guest userspace utilities' depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels') + optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels') provides=("virtualbox-guest-utils=$pkgver") replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') - backup=('etc/conf.d/vboxservice') install=virtualbox-libre-guest-utils.install source "VirtualBox-$pkgver/env.sh" @@ -339,10 +327,6 @@ package_virtualbox-libre-guest-utils(){ # install udev rules install -D -m 0644 60-vboxguest.rules \ "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" - # install rc.d script - install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice" - # install sample config - install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice" # install systemd service file install -D -m644 vboxservice.service \ "$pkgdir/usr/lib/systemd/system/vboxservice.service" diff --git a/libre/virtualbox-libre/vboxservice.conf b/libre/virtualbox-libre/vboxservice.conf deleted file mode 100644 index 9d4ec629f..000000000 --- a/libre/virtualbox-libre/vboxservice.conf +++ /dev/null @@ -1,2 +0,0 @@ -# VBoxService -h -VBOX_SERVICE_OPTION="" diff --git a/libre/virtualbox-libre/vboxservice.rc b/libre/virtualbox-libre/vboxservice.rc deleted file mode 100644 index 5a62d69a3..000000000 --- a/libre/virtualbox-libre/vboxservice.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -name=VBoxService -PID=$(pidof -o %PPID $name) - -case "$1" in - start) - stat_busy 'Starting VirtualBox Guest Service' - [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ - && { add_daemon ${0##*/}; stat_done; } \ - || { stat_fail; exit 1; } - ;; - stop) - stat_busy 'Stopping VirtualBox Guest Service' - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon ${0##*/}; stat_done; } \ - || { stat_fail; exit 1; } - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - status) - stat_busy 'Checking VirtualBox Guest Service status' - ck_status ${0##*/} - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|status}" >&2 - exit 1 -esac - -exit 0 - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf deleted file mode 100644 index c36f6a143..000000000 --- a/libre/virtualbox-libre/vboxweb.conf +++ /dev/null @@ -1,11 +0,0 @@ -# WebService Mandatory Variables -#VBOXWEB_USER= - -# WebService Variables -#VBOXWEB_LOGFILE= -#VBOXWEB_HOST= -#VBOXWEB_PORT= -#VBOXWEB_TIMEOUT= -#VBOXWEB_CHECK_INTERVAL= -#VBOXWEB_THREADS= -#VBOXWEB_KEEPALIVE= diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc deleted file mode 100644 index 97273e3c7..000000000 --- a/libre/virtualbox-libre/vboxweb.rc +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/vbox/vbox.cfg -. /etc/conf.d/vboxweb - -BINARY="$INSTALL_DIR/vboxwebsrv" - -start() { - stat_busy "Starting VirtualBox Web Service"; - if ! pidof -o %PPID $BINARY >/dev/null; then - [[ "$VBOXWEB_USER" ]] || stat_die - lsmod | grep -q "vboxdrv[^_-]" || stat_die - PARAMS="--background" - [[ "$VBOXWEB_HOST" ]] && PARAMS+=" -H $VBOXWEB_HOST" - [[ "$VBOXWEB_PORT" ]] && PARAMS+=" -p $VBOXWEB_PORT" - [[ "$VBOXWEB_TIMEOUT" ]] && PARAMS+=" -t $VBOXWEB_TIMEOUT" - [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL" - [[ "$VBOXWEB_THREADS" ]] && PARAMS+=" -T $VBOXWEB_THREADS" - [[ "$VBOXWEB_KEEPALIVE" ]] && PARAMS+=" -k $VBOXWEB_KEEPALIVE" - [[ "$VBOXWEB_LOGFILE" ]] && PARAMS+=" -F $VBOXWEB_LOGFILE" - # prevent inheriting this setting to VBoxSVC - unset VBOX_RELEASE_LOG_DEST - su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null - # ugly: wait until the final process has forked - sleep .2 - if pidof -o %PPID $BINARY >/dev/null; then - add_daemon vboxweb - stat_done - else - stat_die - fi - else - stat_die - fi -} - -stop() { - stat_busy "Stopping VirtualBox Web Service" - PID=$(pidof -o %PPID $BINARY) - [[ $PID ]] && kill $PID &>/dev/null - if ! pidof -o %PPID $BINARY >/dev/null; then - rm_daemon vboxweb - stat_done - else - stat_die - fi -} - -restart() { - stop && start -} - -status() { - stat_busy "Checking for VirtualBox Web Service" - if pidof -o %PPID $BINARY >/dev/null; then - stat_done - else - stat_fail - false - fi -} - -case "$1" in -start) - start - ;; -stop) - stop - ;; -restart) - restart - ;; -force-reload) - restart - ;; -status) - status - ;; -*) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 -esac - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install index 2d62eae43..067c5b35e 100644 --- a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install +++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install @@ -4,8 +4,8 @@ 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 you can add dkms in your DAEMONS +==> To build and install your modules run: dkms install vboxguest/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service EOF } diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install index 8028cb7e0..8bc316e49 100644 --- a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install +++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install @@ -4,8 +4,8 @@ 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 you can add dkms in your DAEMONS +==> To build and install your modules run: dkms install vboxhost/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service EOF } diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index 90d8a8739..ad4f70f76 100644 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -28,12 +28,6 @@ post_install() { # arg 2: the old package version post_upgrade() { post_install "$1" - if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then - cat << EOF -===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules. -===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package. -EOF - fi } # arg 1: the old package version |