virtualbox: fixed FS#391 (thanks to Mikhail Kolesnik)

4 files changed, 19 insertions, 9 deletions

diff --git a/virtualbox/.footprint b/virtualbox/.footprint
index dfd59041a..cd2c70f62 100644
--- a/virtualbox/.footprint
+++ b/virtualbox/.footprint
@@ -9,6 +9,7 @@ drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/
 drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/
 drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/misc/
 -rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/drivers/misc/vboxdrv.ko
+-rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/drivers/misc/vboxnetflt.ko
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/virtualbox
diff --git a/virtualbox/.md5sum b/virtualbox/.md5sum
index 5dca65d65..307c7ed78 100644
--- a/virtualbox/.md5sum
+++ b/virtualbox/.md5sum
@@ -1,4 +1,4 @@
 2a2724088f65d0a373a689209bb4d938  60-vboxdrv.rules
-bcd403d97e2caf8a634584df34766a4d  VirtualBox-2.1.0-OSE.tar.bz2
+4d8f857c9ead892607387656a9e895bb  VirtualBox-2.1.0-OSE.tar.bz2
 d365878a0f2f0a738a093a6bc48293be  virtualbox
 362e923d42651f370561b0f9095ea7a5  virtualbox.desktop
diff --git a/virtualbox/Pkgfile b/virtualbox/Pkgfile
index b352b65d9..8c5ce87d7 100644
--- a/virtualbox/Pkgfile
+++ b/virtualbox/Pkgfile
@@ -6,11 +6,14 @@
 
 name=virtualbox
 version=2.1.0
-release=1
+release=2
 source=(http://download.virtualbox.org/$name/$version/VirtualBox-$version-OSE.tar.bz2 \
         $name 60-vboxdrv.rules $name.desktop)
 
 build() {
+  KVER=$(uname -r)
+  KDIR=/usr/src/linux
+
   local QT3GUI QT4GUI
   if [ "$(pkginfo -i | grep '^qt3 ')" ]; then
     QT3GUI="--with-qt-dir=/usr/share/qt"
@@ -32,14 +35,15 @@ build() {
               --disable-pulse
   source ./env.sh
   kmk all
-  # compile kernel module
+  # compile kernel modules
   cd out/linux.x86/release/bin/src
-  make
-  # install kernel module
-  install -D -m 0644 vboxdrv.ko $PKG/lib/modules/`uname -r`/kernel/drivers/misc/vboxdrv.ko
+  make KERN_DIR=$KDIR
+  # install kernel modules
+  install -D -m 0644 vboxdrv.ko $PKG/lib/modules/$KVER/kernel/drivers/misc/vboxdrv.ko
+  install -D -m 0644 vboxnetflt.ko $PKG/lib/modules/$KVER/kernel/drivers/misc/vboxnetflt.ko
   # remove superfluous files
   rm -rf $SRC/VirtualBox-$version/out/linux.x86/release/bin/{src,sdk/samples,testcase} \
-    $SRC/VirtualBox-$version/out/linux.x86/release/bin/{vboxdrv.ko,additions/src,nls}
+    $SRC/VirtualBox-$version/out/linux.x86/release/bin/{additions/src,nls,nls3}
   find $SRC/VirtualBox-$version/out/linux.x86/release/bin -type f -name 'tst*' -exec rm -rf {} \;
   # do the rest
   install -D -m 0644 $SRC/60-vboxdrv.rules $PKG/etc/udev/rules.d/60-vboxdrv.rules
diff --git a/virtualbox/README b/virtualbox/README
index 27fc7a08b..c2ada8e41 100644
--- a/virtualbox/README
+++ b/virtualbox/README
@@ -1,6 +1,8 @@
+
 README for virtualbox
 
-GETTING SOURES
+
+GETTING SOURCES
 
   Download sources manually from
   https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_SMI-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=innotek-1.6-src-G-F@CDS-CDS_SMI 
@@ -8,10 +10,12 @@ GETTING SOURES
 
 REQUIREMENTS
 
-  Kernel headers needed for build 'vboxdrv.ko' kernel module.
+  Kernel headers needed to build virtualbox's modules.
+
 
 PRE-INSTALL
 
+
 POST-INSTALL
 
   Run the post-install script in order to add a vboxusers group to your system.
@@ -38,6 +42,7 @@ POST-INSTALL
     SUBSYSTEM=="misc"
     SYSFS{dev}=="10:62"
 
+
 PRECAUTION
 
  If you have problems trying to update virtualbox (xalan-c not found...) use