system/virtualbox-kernel: Updated for version 3.1.2

5 files changed, 23 insertions, 16 deletions

diff --git a/system/virtualbox-kernel/README b/system/virtualbox-kernel/README
index f945dfc65773..ebb7a51ec129 100644
--- a/system/virtualbox-kernel/README
+++ b/system/virtualbox-kernel/README
@@ -3,7 +3,7 @@ virtualisation environment.
 
 To build the package for a kernel different from the running one,
 start the script setting the KERNEL variable as in
-	KERNEL=2.6.27.16 ./virtualbox-kernel.SlackBuild
+	KERNEL=2.6.29.6 ./virtualbox-kernel.SlackBuild
 
 If you want to build a kernel module for an other virtualbox version
 you can use the included "virtualbox-kernel-mksrctarball.sh" which will
diff --git a/system/virtualbox-kernel/slack-desc b/system/virtualbox-kernel/slack-desc
index 10c79d9b06db..817e3daeb57c 100644
--- a/system/virtualbox-kernel/slack-desc
+++ b/system/virtualbox-kernel/slack-desc
@@ -15,3 +15,5 @@ virtualbox-kernel: Homepage: http://www.virtualbox.org
 virtualbox-kernel:
 virtualbox-kernel:
 virtualbox-kernel:
+virtualbox-kernel:
+virtualbox-kernel:
diff --git a/system/virtualbox-kernel/virtualbox-kernel-mksrctarball.sh b/system/virtualbox-kernel/virtualbox-kernel-mksrctarball.sh
index 78e0994e65d7..b758bc049b88 100644
--- a/system/virtualbox-kernel/virtualbox-kernel-mksrctarball.sh
+++ b/system/virtualbox-kernel/virtualbox-kernel-mksrctarball.sh
@@ -9,18 +9,17 @@
 set -e
 
 PRGNAM=virtualbox-kernel
-VBOX_VERSION=$(VBoxManage -v | grep -e ^[0-9].*_OSE)
-VERSION=${VBOX_VERSION:0:5}
+VERSION=$(VBoxManage -v | grep -e ^[0-9].*_OSE | cut -d "_" -f 1)
 
 MODULE_SRC=$(grep "MODULE_SRC=" /etc/vbox/vbox.cfg | cut -d "=" -f 2 | cut -d "\"" -f 2)
 
-echo "--> Copying sourcecode from $INSTALL_DIR/src"
+echo "--> Copying sourcecode from $MODULE_SRC/$PRGNAM-$VERSION"
 cp -rf $MODULE_SRC/$PRGNAM-$VERSION $PRGNAM-$VERSION
 
-echo "--> Making the sourcecode tarball: $PRGNAM-$VERSION.tar.bz2 "
-tar -c $PRGNAM-$VERSION/ | bzip2 > $PRGNAM-$VERSION.tar.bz2
+echo "--> Making the sourcecode tarball: ./$PRGNAM-$VERSION.tar.xz"
+tar -cJf $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
 
-echo "--> Erasing the sourcecode directory: $SRCNAM/"
+echo "--> Erasing the sourcecode directory: ./$PRGNAM-$VERSION/"
 rm -rf $PRGNAM-$VERSION/
 
-echo "--> Sourcecode tarball for $PRGNAM: $PRGNAM-$VERSION.tar.bz2"
+echo "--> Sourcecode tarball for $PRGNAM: $(pwd)/$PRGNAM-$VERSION.tar.xz"
diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
index 0fec2f18856b..29cb9d58deb8 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
+++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-kernel
 
-# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=virtualbox-kernel
-VERSION=${VERSION:-2.1.4}
+VERSION=${VERSION:-3.1.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,6 +33,9 @@ TAG=${TAG:-_SBo}
 KERNEL=${KERNEL:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/$KERNEL/build}
 PKG_VERS=${VERSION}_$(echo $KERNEL | tr - _)
+PKG_ARCH=$ARCH
+
+unset ARCH
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -45,7 +48,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -55,6 +58,7 @@ make KERN_DIR=${KERNELPATH}
 mkdir -p $PKG/lib/modules/$KERNEL/misc
 install -m 0644 vboxdrv.ko $PKG/lib/modules/$KERNEL/misc/
 install -m 0644 vboxnetflt.ko $PKG/lib/modules/$KERNEL/misc/
+install -m 0644 vboxnetadp.ko $PKG/lib/modules/$KERNEL/misc/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS
 cat $CWD/COPYING > $PKG/usr/doc/$PRGNAM-$PKG_VERS/COPYING
@@ -66,4 +70,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$PKG_ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/virtualbox-kernel/virtualbox-kernel.info b/system/virtualbox-kernel/virtualbox-kernel.info
index efaf9e6e362d..7c20f43b0e9d 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.info
+++ b/system/virtualbox-kernel/virtualbox-kernel.info
@@ -1,8 +1,10 @@
 PRGNAM="virtualbox-kernel"
-VERSION="2.1.4"
+VERSION="3.1.2"
 HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://slackbuilds.org/sources/12.2/virtualbox-kernel-2.1.4.tar.bz2"
-MD5SUM="b9660d7d7323ff05d1aeb38f30ea49a0"
-MAINTAINER="ppr:kut"
+DOWNLOAD="http://slackbuilds.org/sources/13.0/virtualbox-kernel-3.1.2.tar.xz"
+MD5SUM="e1e8e1bbd87836b9944d593cc321a04f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
 APPROVED="rworkman"