Bug 295955

(Portage version: 2.2_rc61/cvs/Linux x86_64)

5 files changed, 35 insertions, 81 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 832e1765b179..2b71e2e91937 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vmware-modules
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.52 2009/10/30 18:43:11 vadimk Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.53 2010/01/02 20:07:47 vadimk Exp $
+
+  02 Jan 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  -vmware-modules-1.0.0.24.ebuild, vmware-modules-1.0.0.24-r1.ebuild,
+  vmware-modules-1.0.0.25.ebuild, +files/sched_h-2.6.32.patch:
+  Bug 295955
 
   30 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
   -files/1.0.0.23-makefile-kernel-dir.patch,
diff --git a/app-emulation/vmware-modules/files/sched_h-2.6.32.patch b/app-emulation/vmware-modules/files/sched_h-2.6.32.patch
new file mode 100644
index 000000000000..b7333f7f8541
--- /dev/null
+++ b/app-emulation/vmware-modules/files/sched_h-2.6.32.patch
@@ -0,0 +1,22 @@
+diff -ur vmci-only.before/linux/vmciKernelIf.c vmci-only/linux/vmciKernelIf.c
+--- vmci-only.before/linux/vmciKernelIf.c	2010-01-02 14:56:31.000000000 -0500
++++ vmci-only/linux/vmciKernelIf.c	2010-01-02 14:57:01.000000000 -0500
+@@ -36,6 +36,7 @@
+ #include "compat_module.h"
+ 
+ #include "compat_version.h"
++#include "compat_sched.h"
+ #include "compat_wait.h"
+ #include "compat_interrupt.h"
+ #include "compat_spinlock.h"
+diff -ur vmnet-only.before/vnetUserListener.c vmnet-only/vnetUserListener.c
+--- vmnet-only.before/vnetUserListener.c	2010-01-02 14:56:38.000000000 -0500
++++ vmnet-only/vnetUserListener.c	2010-01-02 14:58:29.000000000 -0500
+@@ -32,6 +32,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/poll.h>
+ #include "compat_skbuff.h"
++#include "compat_sched.h"
+ #include "compat_wait.h"
+ #include "vnetInt.h"
+ 
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
index e7ef1b7af8a8..af62e31863ed 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.1 2009/09/22 17:56:21 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.2 2010/01/02 20:07:47 vadimk Exp $
 
 EAPI="2"
 
@@ -60,6 +60,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-kernel-2.6.29.patch"
 	epatch "${FILESDIR}/${PV}-kernel-2.6.30.patch"
 	epatch "${FILESDIR}/${PV}-vmnet-2.6.31.patch"
+	epatch "${FILESDIR}/sched_h-2.6.32.patch"
 }
 
 src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.24.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24.ebuild
deleted file mode 100644
index b47f8dbdccc4..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.24.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24.ebuild,v 1.2 2009/06/14 21:49:47 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic linux-mod
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI="x86? (
-			mirror://gentoo/${P}.x86.tar.bz2
-			http://dev.gentoo.org/~vadimk/${P}.x86.tar.bz2
-			)
-		 amd64? (
-		 	mirror://gentoo/${P}.amd64.tar.bz2
-			http://dev.gentoo.org/~vadimk/${P}.amd64.tar.bz2
-			)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER
-#	PATCH_VER="1"
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build VMWARE_VER=${VMWARE_VER} KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		unpack ./"${P}"/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV}-kernel-2.6.29.patch"
-	epatch "${FILESDIR}/${PV}-kernel-2.6.30.patch"
-}
-
-src_install() {
-	# this adds udev rules for vmmon*
-	if [[ -n "`echo ${VMWARE_MODULE_LIST} | grep vmmon`" ]];
-	then
-		dodir /etc/udev/rules.d
-		echo 'KERNEL=="vmmon*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
-		echo 'KERNEL=="vmnet*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
-	fi
-
-	linux-mod_src_install
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild
index 20e69c9c80ef..64068c6e2ba2 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild,v 1.4 2009/09/25 10:35:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild,v 1.5 2010/01/02 20:07:47 vadimk Exp $
 
 EAPI="2"
 
@@ -58,6 +58,7 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
 	epatch "${FILESDIR}/${PV}-makefile-include.patch"
+	epatch "${FILESDIR}/sched_h-2.6.32.patch"
 }
 
 src_install() {