Fixed kernel panic on suspend (bug #377229)

(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)

4 files changed, 84 insertions, 5 deletions

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index 2afd5231535c..166fed07d4e5 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.86 2011/07/22 16:58:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.87 2011/08/07 11:18:29 polynomial-c Exp $
+
+*virtualbox-modules-4.1.0-r1 (07 Aug 2011)
+
+  07 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-modules-4.1.0-r1.ebuild,
+  +files/virtualbox-modules-4.1.0-vboxbug9305.patch, metadata.xml:
+  Fixed kernel panic on suspend. Thanks to Martin Atenreit for reporting this
+  in bug #377229.
 
   22 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
   virtualbox-modules-4.0.12.ebuild:
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch
new file mode 100644
index 000000000000..be0f5d91d752
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch
@@ -0,0 +1,11 @@
+--- vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73209)
++++ vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73210)
+@@ -77,7 +77,7 @@
+  * @param pvUser2           The notification event.
+  * @remarks This can be invoked in interrupt context.
+  */
+-static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
++static DECLCALLBACK(void) rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+ {
+     unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
+     NOREF(pvUser1);
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index 702621ee83d7..70197e4e4541 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <herd>no-herd</herd>
   <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
@@ -10,8 +14,4 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
-  <maintainer>
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..48e4b98944f2
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild,v 1.1 2011/08/07 11:18:29 polynomial-c Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=2
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-vboxbug9305.patch
+
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "Starting with the 3.x release new kernel modules were added,"
+	elog "be sure to load all the needed modules."
+	elog ""
+	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
+	if has_version sys-apps/openrc; then
+		elog "/etc/conf.d/modules"
+	else
+		elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+	fi
+}