summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@liwjatan.at>2011-10-30 21:36:44 -0500
committerNiels Horn <niels.horn@slackbuilds.org>2011-11-04 21:59:29 -0200
commit029b68989a5ce7d402177631e5375a274fb06fc9 (patch)
treee97b01744c9f193e7d99906b0a1854dd2df3b1ed
parentf285e922d881e386d894e4945b5987e8738f0930 (diff)
downloadslackbuilds-029b68989a5ce7d402177631e5375a274fb06fc9.tar.gz
system/virtualbox: Updated for version 4.1.4.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--system/virtualbox/doinst.sh1
-rw-r--r--system/virtualbox/slack-desc4
-rw-r--r--system/virtualbox/vbox-disable_vboxpci_build.diff18
-rw-r--r--system/virtualbox/vboxdrv.sh-setup.diff20
-rw-r--r--system/virtualbox/virtualbox.SlackBuild22
-rw-r--r--system/virtualbox/virtualbox.info18
6 files changed, 60 insertions, 23 deletions
diff --git a/system/virtualbox/doinst.sh b/system/virtualbox/doinst.sh
index a5d2e8eae6..653a8da81e 100644
--- a/system/virtualbox/doinst.sh
+++ b/system/virtualbox/doinst.sh
@@ -40,4 +40,5 @@ fi
config etc/vbox/vbox.cfg.new
config etc/default/virtualbox.new
preserve_perms etc/rc.d/rc.vboxdrv.new
+preserve_perms etc/rc.d/rc.vboxballoonctrl-service.new
diff --git a/system/virtualbox/slack-desc b/system/virtualbox/slack-desc
index bc28f01128..b9a2b5aeb7 100644
--- a/system/virtualbox/slack-desc
+++ b/system/virtualbox/slack-desc
@@ -8,8 +8,8 @@
|-----handy-ruler-------------------------------------------------------|
virtualbox: virtualbox (x86 Virtualizer)
virtualbox:
-virtualbox: VirtualBox is a powerful PC virtualization solution allowingyou to run
-virtualbox: a wide range of PC operating systems on your Linux system. This
+virtualbox: VirtualBox is a powerful PC virtualization solution allowing you to
+virtualbox: run a wide range of PC operating systems on your Linux system. This
virtualbox: includes Windows, Linux, FreeBSD, DOS, OpenBSD and others. VirtualBox
virtualbox: comes with a broad feature set and excellent performance, making it
virtualbox: the premier virtualization software solution on the market.
diff --git a/system/virtualbox/vbox-disable_vboxpci_build.diff b/system/virtualbox/vbox-disable_vboxpci_build.diff
new file mode 100644
index 0000000000..04f0359145
--- /dev/null
+++ b/system/virtualbox/vbox-disable_vboxpci_build.diff
@@ -0,0 +1,18 @@
+--- Makefile.kmk.orig 2011-08-15 14:28:45.000000000 +0200
++++ Makefile.kmk 2011-09-16 12:21:33.049000016 +0200
+@@ -19,6 +19,7 @@
+ include $(KBUILD_PATH)/subheader.kmk
+ if1of ($(KBUILD_TARGET), linux)
+
++ ifdef VBOX_VITH_VBOXDRV
+ #
+ # The driver.
+ # Note! For Linux, this is just a compile test. Don't use the binary!
+@@ -40,6 +41,7 @@
+ VBoxPci.c
+ VBoxPci_LIBS += \
+ $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
++ endif # VBOX_VITH_VBOXDRV
+
+
+ #
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index 1ebcb32b4c..de679fe801 100644
--- a/system/virtualbox/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
@@ -1,6 +1,6 @@
---- vboxdrv.sh.in.orig 2011-05-16 18:33:43.000000000 +0200
-+++ vboxdrv.sh.in 2011-06-12 10:10:38.074000027 +0200
-@@ -42,16 +42,8 @@
+--- vboxdrv.sh.in.orig 2011-08-15 14:28:34.000000000 +0200
++++ vboxdrv.sh.in 2011-09-13 15:22:47.192000014 +0200
+@@ -42,18 +42,8 @@
if [ -n "$INSTALL_DIR" ]; then
VBOXMANAGE="$INSTALL_DIR/VBoxManage"
@@ -8,16 +8,18 @@
- BUILDVBOXDRV="$INSTALL_DIR/src/vboxhost/vboxdrv/build_in_tmp"
- BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxhost/vboxnetflt/build_in_tmp"
- BUILDVBOXNETADP="$INSTALL_DIR/src/vboxhost/vboxnetadp/build_in_tmp"
+- BUILDVBOXPCI="$INSTALL_DIR/src/vboxhost/vboxpci/build_in_tmp"
else
VBOXMANAGE="/usr/lib/%PACKAGE%/VBoxManage"
- DODKMS="/usr/share/%PACKAGE%/src/vboxhost/do_dkms"
- BUILDVBOXDRV="/usr/share/%PACKAGE%/src/vboxhost/vboxdrv/build_in_tmp"
- BUILDVBOXNETFLT="/usr/share/%PACKAGE%/src/vboxhost/vboxnetflt/build_in_tmp"
- BUILDVBOXNETADP="/usr/share/%PACKAGE%/src/vboxhost/vboxnetadp/build_in_tmp"
+- BUILDVBOXPCI="/usr/share/%PACKAGE%/src/vboxhost/vboxpci/build_in_tmp"
fi
# silently exit if the package was uninstalled but not purged,
-@@ -288,48 +280,7 @@
+@@ -299,58 +289,7 @@
# setup_script
setup()
{
@@ -25,6 +27,11 @@
- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
- $DODKMS uninstall > $LOG
- succ_msg
+- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
+- begin_msg "Removing old VirtualBox pci kernel module"
+- find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+- succ_msg
+- fi
- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
- begin_msg "Removing old VirtualBox netadp kernel module"
- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
@@ -59,6 +66,11 @@
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
+- if ! $BUILDVBOXPCI \
+- --use-module-symvers /tmp/vboxdrv-Module.symvers \
+- --no-print-directory install >> $LOG 2>&1; then
+- failure "Look at $LOG to find out what went wrong"
+- fi
- fi
- rm -f /etc/vbox/module_not_compiled
- succ_msg
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 25e5cf8155..2ce1b7070d 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=virtualbox
SRCNAM=VirtualBox
-VERSION=4.0.8
+VERSION=4.1.4
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -120,6 +120,9 @@ fi
# Patch taken from gentoo
patch -p1 -i $CWD/virtualbox-4-makeself-check.patch
+# building the vboxpci kernel module is not disabled by --disable-kmods
+patch -d src/VBox/HostDrivers/VBoxPci -i $CWD/vbox-disable_vboxpci_build.diff
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -144,12 +147,14 @@ mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,share,include}/virtualbox \
$PKG/usr/share/{pixmaps,mime/packages} \
$PKG/etc/{default,rc.d,vbox}
-cp -f src/VBox/Installer/linux/vboxdrv.sh.in $PKG/etc/rc.d/rc.vboxdrv.new
-sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.vboxdrv.new
-sed -i "s/%NOLSB%/yes/" $PKG/etc/rc.d/rc.vboxdrv.new
-sed -i "s/%DEBIAN%/no/" $PKG/etc/rc.d/rc.vboxdrv.new
-sed -i "s/%GROUP%/vboxusers/" $PKG/etc/rc.d/rc.vboxdrv.new
-sed -i "s/\[ -z \"\$DEBIAN\"/#\[ -z \"\$DEBIAN\"/" $PKG/etc/rc.d/rc.vboxdrv.new
+for i in vboxdrv vboxballoonctrl-service; do
+ cp -f src/VBox/Installer/linux/$i.sh.in $PKG/etc/rc.d/rc.$i.new
+ sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.$i.new
+ sed -i "s/%NOLSB%/yes/" $PKG/etc/rc.d/rc.$i.new
+ sed -i "s/%DEBIAN%/no/" $PKG/etc/rc.d/rc.$i.new
+ sed -i "s/%GROUP%/vboxusers/" $PKG/etc/rc.d/rc.$i.new
+ sed -i "s/\[ -z \"\$DEBIAN\"/#\[ -z \"\$DEBIAN\"/" $PKG/etc/rc.d/rc.$i.new
+done
cp -f $CWD/vbox.cfg $PKG/etc/vbox/vbox.cfg.new
sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" $PKG/etc/vbox/vbox.cfg.new
@@ -196,7 +201,8 @@ cd out/linux.$BUILDDIR/release/bin/
mv $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox.sh $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox
cd $TMP/$SRCNAM-${VERSION}_OSE
-for i in VBoxManage vboxmanage VBoxSDL vboxsdl VBoxHeadless vboxheadless VBoxVRDP $guiapp $vboxwebsrv; do
+for i in VBoxManage vboxmanage VBoxSDL vboxsdl VBoxHeadless \
+ vboxheadless VBoxVRDP VBoxBalloonCtrl $guiapp $vboxwebsrv; do
ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i
done
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
index 01066b0a57..885a79dc48 100644
--- a/system/virtualbox/virtualbox.info
+++ b/system/virtualbox/virtualbox.info
@@ -1,14 +1,14 @@
PRGNAM="virtualbox"
-VERSION="4.0.8"
+VERSION="4.1.4"
HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/4.0.8/VirtualBox-4.0.8.tar.bz2 \
- http://download.virtualbox.org/virtualbox/4.0.8/VBoxGuestAdditions_4.0.8.iso \
- http://download.virtualbox.org/virtualbox/4.0.8/UserManual.pdf \
- http://download.virtualbox.org/virtualbox/4.0.8/SDKRef.pdf"
-MD5SUM="a3e81289f2357fcf4bbe3e77805f38b6 \
- 598ca9b231c1f1ff7817aa76c80f55d6 \
- 39712ccbc16b04c1cda209ae16446bf2 \
- d332f36212b6534e2ce4381e1aea520f"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2 \
+ http://download.virtualbox.org/virtualbox/4.1.4/VBoxGuestAdditions_4.1.4.iso \
+ http://download.virtualbox.org/virtualbox/4.1.4/UserManual.pdf \
+ http://download.virtualbox.org/virtualbox/4.1.4/SDKRef.pdf"
+MD5SUM="dc6e6801b3823332b6ca2e9915221aae \
+ 3ea70652459c8590efb8c64f83f4736a \
+ bc048d1e58d84ece4a186199ee48d4c8 \
+ 2ced36e5b79a30b8b4356ce2c099afa8"
DOWNLOAD_x86_64="UNTESTED"
MD5SUM_x86_64=""
MAINTAINER="Heinz Wiesinger"