summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2016-12-27 16:47:38 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-12-31 08:22:48 +0700
commitd73b2f152c4270fc4ac6a2ade73ebcfc576ebd6f (patch)
treed4288bbdd9ed63f8de4b65e1e2f8e85921b7b7fe
parent52ebaf4c74ff0c13b99a1d0e3c8fbb3dfcf4a04e (diff)
downloadslackbuilds-d73b2f152c4270fc4ac6a2ade73ebcfc576ebd6f.tar.gz
system/virtualbox-addons: Updated for version 5.0.30.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
-rw-r--r--system/virtualbox-addons/rc.vboxadd.diff86
-rw-r--r--system/virtualbox-addons/virtualbox-addons.SlackBuild2
-rw-r--r--system/virtualbox-addons/virtualbox-addons.info6
3 files changed, 55 insertions, 39 deletions
diff --git a/system/virtualbox-addons/rc.vboxadd.diff b/system/virtualbox-addons/rc.vboxadd.diff
index 929c25eeaf..f0b3acddd0 100644
--- a/system/virtualbox-addons/rc.vboxadd.diff
+++ b/system/virtualbox-addons/rc.vboxadd.diff
@@ -1,6 +1,6 @@
---- vboxadd.sh.orig 2016-01-19 17:40:04.000000000 +0100
-+++ vboxadd.sh 2016-01-23 15:46:17.000000000 +0100
-@@ -146,42 +146,9 @@
+--- vboxadd.sh.orig 2016-11-23 16:24:46.000000000 +0100
++++ vboxadd.sh 2016-12-27 16:06:46.413895799 +0100
+@@ -154,42 +154,9 @@
dev=/dev/vboxguest
userdev=/dev/vboxuser
@@ -43,7 +43,7 @@
running_vboxguest()
{
lsmod | grep -q "vboxguest[^_-]"
-@@ -253,13 +220,6 @@
+@@ -261,13 +228,6 @@
start()
{
begin "Starting the VirtualBox Guest Additions ";
@@ -57,10 +57,32 @@
uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
no_udev=1
-@@ -331,202 +291,16 @@
+@@ -378,218 +338,16 @@
return 0
}
+-## Update the initramfs. Debian and Ubuntu put the graphics driver in, and
+-# need the touch(1) command below. Everyone else that I checked just need
+-# the right module alias file from depmod(1) and only use the initramfs to
+-# load the root filesystem, not the boot splash. update-initramfs works
+-# for the first two and dracut for every one else I checked. We are only
+-# interested in distributions recent enough to use the KMS vboxvideo driver.
+-## @param $1 kernel version to update for.
+-update_module_dependencies()
+-{
+- depmod "${1}"
+- rm -f "/lib/modules/${1}/initrd/vboxvideo"
+- test -d "/lib/modules/${1}/initrd" &&
+- test -f "/lib/modules/${1}/misc/vboxvideo.ko" &&
+- touch "/lib/modules/${1}/initrd/vboxvideo"
+- test -n "${QUICKSETUP}" && return
+- if type dracut >/dev/null 2>&1; then
+- dracut -f "/boot/initramfs-${1}.img" "${1}"
+- elif type update-initramfs >/dev/null 2>&1; then
+- update-initramfs -u -k "${1}"
+- fi
+-}
+-
-# Remove any existing VirtualBox guest kernel modules from the disk, but not
-# from the kernel as they may still be in use
-cleanup_modules()
@@ -113,21 +135,15 @@
- return 1
- fi
- succ_msg
-- if expr `uname -r` '<' '2.6.27' > /dev/null; then
-- echo "Not building the VirtualBox advanced graphics driver as this Linux version is"
-- echo "too old to use it."
-- else
-- begin "Building the OpenGL support module"
-- if ! $BUILDINTMP \
-- --use-module-symvers /tmp/vboxguest-Module.symvers \
-- --module-source $MODULE_SRC/vboxvideo \
-- --no-print-directory install >> $LOG 2>&1; then
-- show_error "Look at $LOG to find out what went wrong. The module is not built but the others are."
-- else
-- succ_msg
-- fi
+- begin "Building the graphics driver module"
+- if ! $BUILDINTMP \
+- --use-module-symvers /tmp/vboxguest-Module.symvers \
+- --module-source $MODULE_SRC/vboxvideo \
+- --no-print-directory install >> $LOG 2>&1; then
+- show_error "Look at $LOG to find out what went wrong"
- fi
-- depmod
+- succ_msg
+- update_module_dependencies "${KERN_VER}"
- return 0
-}
-
@@ -179,21 +195,15 @@
- # And an rc file to re-build the kernel modules and re-set-up the X server.
- ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
- ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
-- # At least Fedora 11 and Fedora 12 require the correct security context when
-- # executing this command from service scripts. Shouldn't hurt for other
-- # distributions.
-- chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1
-- # And at least Fedora 15 needs this for the acceleration support check to
-- # work
-- redhat_release=`cat /etc/redhat-release 2> /dev/null`
-- case "$redhat_release" in Fedora\ release\ 15* )
-- for i in "$lib_path"/*.so
-- do
-- restorecon "$i" >/dev/null
-- done
-- ;;
-- esac
--
+- # SELinux security context for the mount helper.
+- if test -e /etc/selinux/config; then
+- # This is correct. semanage maps this to the real path, and it aborts
+- # with an error, telling you what you should have typed, if you specify
+- # the real path. The "chcon" is there as a back-up in case this is
+- # different on old guests.
+- semanage fcontext -a -t mount_exec_t "/usr/lib/$PACKAGE/mount.vboxsf"
+- chcon -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf"
+- fi
- succ_msg
-}
-
@@ -246,18 +256,24 @@
-
- # Delete old versions of VBox modules.
- cleanup_modules
-- depmod
+- for i in /lib/modules/*; do
+- update_module_dependencies "${i#/lib/modules/}"
+- done
-
- # Remove old module sources
- for i in $OLDMODULES; do
- rm -rf /usr/src/$i-*
- done
-
+- # Clean-up X11-related bits
+- /sbin/rcvboxadd-x11 cleanup
+-
- # Remove other files
- rm /sbin/mount.vboxsf 2>/dev/null
- rm /sbin/rcvboxadd 2>/dev/null
- rm /sbin/rcvboxadd-x11 2>/dev/null
- rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
+- rm -f /lib/modules/*/initrd/vboxvideo
+ echo "Not implemented! Please use removepkg or pkgtool to remove virtualbox-addons and/or virtualbox-kernel-addons instead."
}
diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild
index 8def06a50c..6720dfb941 100644
--- a/system/virtualbox-addons/virtualbox-addons.SlackBuild
+++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=virtualbox-addons
SRCNAM=VirtualBox
-VERSION=${VERSION:-5.0.14}
+VERSION=${VERSION:-5.0.30}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info
index b20987a7c6..4426215d21 100644
--- a/system/virtualbox-addons/virtualbox-addons.info
+++ b/system/virtualbox-addons/virtualbox-addons.info
@@ -1,8 +1,8 @@
PRGNAM="virtualbox-addons"
-VERSION="5.0.14"
+VERSION="5.0.30"
HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.14/VirtualBox-5.0.14.tar.bz2"
-MD5SUM="e0a02426ad09b475e630881efe911423"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.30/VirtualBox-5.0.30.tar.bz2"
+MD5SUM="9ba8ff724dadfb7327dc4c6401afb7a8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""