system/virtualbox-kernel: Updated for version 2.1.4

5 files changed, 32 insertions, 33 deletions

diff --git a/system/virtualbox-kernel/README b/system/virtualbox-kernel/README
index 5b3b689fcd7e9..f945dfc657730 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.7 ./virtualbox-kernel.SlackBuild
+	KERNEL=2.6.27.16 ./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/doinst.sh b/system/virtualbox-kernel/doinst.sh
index 22dbe825ead40..03d260b752d77 100644
--- a/system/virtualbox-kernel/doinst.sh
+++ b/system/virtualbox-kernel/doinst.sh
@@ -1 +1 @@
-chroot . /sbin/depmod -ae
+chroot . /sbin/depmod -ae @KERNEL@
diff --git a/system/virtualbox-kernel/virtualbox-kernel-mksrctarball.sh b/system/virtualbox-kernel/virtualbox-kernel-mksrctarball.sh
index ed462db9bce9b..78e0994e65d7e 100644
--- a/system/virtualbox-kernel/virtualbox-kernel-mksrctarball.sh
+++ b/system/virtualbox-kernel/virtualbox-kernel-mksrctarball.sh
@@ -8,20 +8,19 @@
 
 set -e
 
-PRGNAM=vbox-kernel-module
-SRCNAM=vboxdrv
+PRGNAM=virtualbox-kernel
 VBOX_VERSION=$(VBoxManage -v | grep -e ^[0-9].*_OSE)
 VERSION=${VBOX_VERSION:0:5}
 
 MODULE_SRC=$(grep "MODULE_SRC=" /etc/vbox/vbox.cfg | cut -d "=" -f 2 | cut -d "\"" -f 2)
 
 echo "--> Copying sourcecode from $INSTALL_DIR/src"
-cp -rf $MODULE_SRC/$SRCNAM-$VERSION $SRCNAM
+cp -rf $MODULE_SRC/$PRGNAM-$VERSION $PRGNAM-$VERSION
 
-echo "--> Making the sourcecode tarball: $PRGNAM-src-$VERSION.tar.bz2 "
-tar -c $SRCNAM/ | bzip2 > $PRGNAM-src-$VERSION.tar.bz2
+echo "--> Making the sourcecode tarball: $PRGNAM-$VERSION.tar.bz2 "
+tar -c $PRGNAM-$VERSION/ | bzip2 > $PRGNAM-$VERSION.tar.bz2
 
 echo "--> Erasing the sourcecode directory: $SRCNAM/"
-rm -rf $SRCNAM/
+rm -rf $PRGNAM-$VERSION/
 
-echo "--> Sourcecode tarball for $PRGNAM: $PRGNAM-src-$VERSION.tar.bz2"
+echo "--> Sourcecode tarball for $PRGNAM: $PRGNAM-$VERSION.tar.bz2"
diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
index 903d1251a0baa..0fec2f18856ba 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 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,20 +24,19 @@
 
 # Modified by SlackBuilds.org
 
-NAME=vbox-kernel-module
-PKG_NAME=virtualbox-kernel
-VERSION=2.0.6
+PRGNAM=virtualbox-kernel
+VERSION=${VERSION:-2.1.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-KERNELVERSION=${KERNELVERSION:-$(uname -r)}
-KERNELPATH=${KERNELPATH:-/lib/modules/$KERNELVERSION/build}
-PKG_VERS=${VERSION}_$(echo $KERNELVERSION | tr - _)
+KERNEL=${KERNEL:-$(uname -r)}
+KERNELPATH=${KERNELPATH:-/lib/modules/$KERNEL/build}
+PKG_VERS=${VERSION}_$(echo $KERNEL | tr - _)
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$NAME}
+PKG=${PKG:-$TMP/package-$PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -45,25 +44,26 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf vboxdrv
-tar xvf $CWD/$NAME-src-$VERSION.tar.bz2
-cd vboxdrv
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-make KERN_DIR=$KERNELPATH
+make KERN_DIR=${KERNELPATH}
 
-mkdir -p $PKG/lib/modules/$KERNELVERSION/misc
-install -m 0644 vboxdrv.ko $PKG/lib/modules/$KERNELVERSION/misc/
+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/
 
-mkdir -p $PKG/usr/doc/$PKG_NAME-$PKG_VERS
-cat $CWD/COPYING > $PKG/usr/doc/$PKG_NAME-$PKG_VERS/COPYING
-cat $CWD/COPYING.CDDL > $PKG/usr/doc/$PKG_NAME-$PKG_VERS/COPYING.CDDL
-cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$PKG_NAME-$PKG_VERS/$PKG_NAME.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS
+cat $CWD/COPYING > $PKG/usr/doc/$PRGNAM-$PKG_VERS/COPYING
+cat $CWD/COPYING.CDDL > $PKG/usr/doc/$PRGNAM-$PKG_VERS/COPYING.CDDL
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKG_VERS/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKG_NAME-$PKG_VERS-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.tgz
diff --git a/system/virtualbox-kernel/virtualbox-kernel.info b/system/virtualbox-kernel/virtualbox-kernel.info
index 6baaa757ae29a..efaf9e6e362da 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.info
+++ b/system/virtualbox-kernel/virtualbox-kernel.info
@@ -1,8 +1,8 @@
 PRGNAM="virtualbox-kernel"
-VERSION="2.0.6"
+VERSION="2.1.4"
 HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://slackbuilds.org/sources/12.1/vbox-kernel-module-src-2.0.6.tar.bz2"
-MD5SUM="17131b76c5dd9c9292cda86e0beccd75"
+DOWNLOAD="http://slackbuilds.org/sources/12.2/virtualbox-kernel-2.1.4.tar.bz2"
+MD5SUM="b9660d7d7323ff05d1aeb38f30ea49a0"
 MAINTAINER="ppr:kut"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="dsomero"
+APPROVED="rworkman"