Tue Aug 2 04:35:55 UTC 2011

4 files changed, 33 insertions, 8 deletions

diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD
index 98b245770..9df5a53bf 100644
--- a/community-testing/virtualbox/PKGBUILD
+++ b/community-testing/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 52407 2011-07-24 17:47:57Z ibiru $
+# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
 pkgver=4.1.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -15,8 +15,9 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
-        change_default_driver_dir.patch)
-_kernver=3.0.0-ARCH
+        change_default_driver_dir.patch
+        fix-kernel-panic.patch)
+_kernver=3.0-ARCH
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -25,6 +26,7 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+    patch -Np0 -i "$srcdir/fix-kernel-panic.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -201,5 +203,6 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
          'ed1341881437455d9735875ddf455fbe'
          '4cf75d9c091199a47a7a1bc2f4e347d9'
          '78ffa67ff131680f1d2b6f06d4325c5b'
-         '838c4c4ebe11b34ae2168df5cd06f694'
-         '97e193f050574dd272a38e5ee5ebe62b')
+         'b3de603560b2fb2c33e704e4e8ab3de8'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '19b05b85a8a46af5a429b2ab618638cd')
diff --git a/community-testing/virtualbox/fix-kernel-panic.patch b/community-testing/virtualbox/fix-kernel-panic.patch
new file mode 100644
index 000000000..237715db2
--- /dev/null
+++ b/community-testing/virtualbox/fix-kernel-panic.patch
@@ -0,0 +1,22 @@
+Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c

+===================================================================

+--- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73165)

++++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73166)

+@@ -32,6 +32,7 @@

+ #include "internal/iprt.h"

+ 

+ #include <iprt/mp.h>

++#include <iprt/asm-amd64-x86.h>

+ #include <iprt/err.h>

+ #include <iprt/cpuset.h>

+ #include <iprt/thread.h>

+@@ -82,7 +83,8 @@

+     NOREF(pvUser1);

+ 

+     AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));

+-    AssertRelease(idCpu == RTMpCpuId());   /* ASSUMES iCpu == RTCPUID */

++    AssertReleaseMsg(idCpu == RTMpCpuId(),  /* ASSUMES iCpu == RTCPUID */

++                     ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));

+ 

+     switch (ulNativeEvent)

+     {
\ No newline at end of file
diff --git a/community-testing/virtualbox/vboxdrv.sh b/community-testing/virtualbox/vboxdrv.sh
index 5eb7ecb89..845f6c769 100755
--- a/community-testing/virtualbox/vboxdrv.sh
+++ b/community-testing/virtualbox/vboxdrv.sh
@@ -21,7 +21,7 @@ fi
 case "$1" in
   setup)
     stat_busy "Unloading VirtualBox kernel modules"
-    for module in vbox{netflt,netadp,drv}; do
+    for module in vbox{netflt,netadp,drv,pci}; do
       if grep -q "^${module}" /proc/modules; then
         MODLIST+=($module)
         modprobe -r $module
diff --git a/community-testing/virtualbox/virtualbox-archlinux-modules.install b/community-testing/virtualbox/virtualbox-archlinux-modules.install
index d3e425584..40e979b05 100644
--- a/community-testing/virtualbox/virtualbox-archlinux-modules.install
+++ b/community-testing/virtualbox/virtualbox-archlinux-modules.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION='3.0.0-ARCH'
+KERNEL_VERSION='3.0-ARCH'
 
 post_install() {
   cat << EOM