replaced by vmware-modules-235 (in overlay)

(Portage version: 2.1.9.24/cvs/Linux x86_64)

7 files changed, 8 insertions, 374 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index de886ac4bf4c..8162f28e5e23 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.59 2010/11/05 16:27:29 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.60 2010/11/21 13:22:40 vadimk Exp $
+
+  21 Nov 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  -files/1.0.0.26-ioctl-2.6.36.patch, -files/1.0.0.26-iommu_map.patch,
+  -files/1.0.0.26-makefile-include.patch,
+  -files/1.0.0.26-makefile-kernel-dir.patch, -files/1.0.0.26-sk_sleep.patch,
+  -vmware-modules-1.0.0.26.ebuild:
+  replaced by vmware-modules-235 (in overlay)
 
   05 Nov 2010; Fabio Erculiani <lxnay@gentoo.org>
   vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild,
diff --git a/app-emulation/vmware-modules/files/1.0.0.26-ioctl-2.6.36.patch b/app-emulation/vmware-modules/files/1.0.0.26-ioctl-2.6.36.patch
deleted file mode 100644
index 1b9cf18e5c3a..000000000000
--- a/app-emulation/vmware-modules/files/1.0.0.26-ioctl-2.6.36.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -143,6 +143,9 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
- #define VMW_NOPAGE_2624
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
-+#define VMW_HAVE_UNLOCKED_IOCTL
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && \
-     (defined(CONFIG_SMP) || defined(CONFIG_PREEMPT))
- #  define kernel_locked_by_current() kernel_locked()
diff --git a/app-emulation/vmware-modules/files/1.0.0.26-iommu_map.patch b/app-emulation/vmware-modules/files/1.0.0.26-iommu_map.patch
deleted file mode 100644
index 0690ac38f5f3..000000000000
--- a/app-emulation/vmware-modules/files/1.0.0.26-iommu_map.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vmmon-only/linux/iommu.c.orig	2010-01-22 23:50:32.000000000 -0500
-+++ vmmon-only/linux/iommu.c	2010-08-04 14:18:34.000000000 -0400
-@@ -153,7 +153,7 @@
-          map_to =  PPN_2_PA(mpn);
-          map_prot = IOMMU_READ | IOMMU_WRITE;
-       }
--      if ((status = iommu_map_range(vmLinux->iommuDomain,
-+      if ((status = iommu_map(vmLinux->iommuDomain,
-                                     PPN_2_PA(ppn),
-                                     map_to, PAGE_SIZE, map_prot))) {
-          printk(KERN_ERR "%s: IOMMU Mapping of PPN 0x%x -> MPN 0x%x "
-@@ -400,7 +400,7 @@
- 
-    /* Relinquish the IOMMU domain used by this VM. */
-    for (ppn = 0; ppn < vmLinux->numPages; ppn++) {
--      iommu_unmap_range(vmLinux->iommuDomain, PPN_2_PA(ppn), PAGE_SIZE);
-+      iommu_unmap(vmLinux->iommuDomain, PPN_2_PA(ppn), PAGE_SIZE);
-    }
-    if (vmLinux->iommuDomain) {
-       iommu_domain_free(vmLinux->iommuDomain);
diff --git a/app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch b/app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch
deleted file mode 100644
index 777a3fd8bb6f..000000000000
--- a/app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/work/vmblock-only/Makefile.kernel b/work/vmblock-only/Makefile.kernel
-index 9d7c5ca..92cefff 100644
---- a/work/vmblock-only/Makefile.kernel
-+++ b/work/vmblock-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE += -I$(SRCROOT)/include
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c,   -DVMW_HAVE_EPOLL, )
-diff --git a/work/vmci-only/Makefile.kernel b/work/vmci-only/Makefile.kernel
-index 22dc232..67e709f 100644
---- a/work/vmci-only/Makefile.kernel
-+++ b/work/vmci-only/Makefile.kernel
-@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
- 
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
- 
-diff --git a/work/vmmon-only/Makefile.kernel b/work/vmmon-only/Makefile.kernel
-index a7e26ea..befaca7 100644
---- a/work/vmmon-only/Makefile.kernel
-+++ b/work/vmmon-only/Makefile.kernel
-@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
- 	   -I$(SRCROOT)/vmcore
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c,   -DVMW_SKAS_MMAP, )
-diff --git a/work/vmnet-only/Makefile.kernel b/work/vmnet-only/Makefile.kernel
-index 4b16d06..0e252a6 100644
---- a/work/vmnet-only/Makefile.kernel
-+++ b/work/vmnet-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE := -I$(SRCROOT)
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c,   -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
-diff --git a/work/vsock-only/Makefile.kernel b/work/vsock-only/Makefile.kernel
-index 47ef5f3..b3539ef 100644
---- a/work/vsock-only/Makefile.kernel
-+++ b/work/vsock-only/Makefile.kernel
-@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
- INCLUDE += -I$(SRCROOT)/linux
- INCLUDE += -I$(SRCROOT)/common
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c,   -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- 
diff --git a/app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch
deleted file mode 100644
index d4bd6d12fed0..000000000000
--- a/app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
-index 0bd0e74..27c3ede 100644
---- a/work/vmblock-only/Makefile
-+++ b/work/vmblock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR) 
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmblock
- PRODUCT := tools
-diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile
-index 7babb8a..fbc5878 100644
---- a/work/vmci-only/Makefile
-+++ b/work/vmci-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmci
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
-index 4b4eb3e..1bb35ef 100644
---- a/work/vmmon-only/Makefile
-+++ b/work/vmmon-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmmon
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
-index 06856e7..fd53bf8 100644
---- a/work/vmnet-only/Makefile
-+++ b/work/vmnet-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmnet
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vsock-only/Makefile b/work/vsock-only/Makefile
-index e02adb0..210e502 100644
---- a/work/vsock-only/Makefile
-+++ b/work/vsock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vsock
- PRODUCT := ws
diff --git a/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch
deleted file mode 100644
index 93b3df62b8c8..000000000000
--- a/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- vsock-only/linux/af_vsock.c.orig	2010-01-22 20:09:09.000000000 -0500
-+++ vsock-only/linux/af_vsock.c	2010-08-04 14:16:34.000000000 -0400
-@@ -3221,7 +3221,7 @@
-     * a notification of an error.
-     */
-    timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
-       if (timeout == 0) {
-@@ -3244,7 +3244,7 @@
-          goto outWaitError;
-       }
- 
--      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-    }
- 
-    if (sk->compat_sk_err) {
-@@ -3256,7 +3256,7 @@
-    }
- 
- outWait:
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);
-    return err;
-@@ -3316,7 +3316,7 @@
-     * upon connection establishment.
-     */
-    timeout = sock_sndtimeo(listener, flags & O_NONBLOCK);
--   compat_init_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
- 
-    while ((connected = VSockVmciDequeueAccept(listener)) == NULL &&
-           listener->compat_sk_err == 0) {
-@@ -3332,7 +3332,7 @@
-          goto outWait;
-       }
- 
--      compat_cont_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+      compat_cont_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
-    }
- 
-    if (listener->compat_sk_err) {
-@@ -3366,7 +3366,7 @@
-    }
- 
- outWait:
--   compat_finish_wait(listener->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(listener), &wait, TASK_RUNNING);
- out:
-    release_sock(listener);
-    return err;
-@@ -3464,7 +3464,7 @@
-    sk = sock->sk;
-    vsk = vsock_sk(sk);
- 
--   poll_wait(file, sk->compat_sk_sleep, wait);
-+   poll_wait(file, compat_sk_sleep(sk), wait);
-    mask = 0;
- 
-    if (sk->compat_sk_err) {
-@@ -4104,7 +4104,7 @@
-       goto out;
-    }
- 
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while (totalWritten < len) {
-       Bool sentWrote;
-@@ -4141,7 +4141,7 @@
-             goto outWait;
-          }
- 
--         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
-+         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
-                                      &wait, TASK_INTERRUPTIBLE);
-       }
- 
-@@ -4194,7 +4194,7 @@
-    if (totalWritten > 0) {
-       err = totalWritten;
-    }
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);
-    return err;
-@@ -4428,7 +4428,7 @@
-       goto out;
-    }
- 
--   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
- 
-    while ((ready = VSockVmciStreamHasData(vsk)) < target &&
-           sk->compat_sk_err == 0 &&
-@@ -4468,7 +4468,7 @@
-          goto outWait;
-       }
- 
--      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
-+      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-    }
- 
-    if (sk->compat_sk_err) {
-@@ -4534,7 +4534,7 @@
-    err = copied;
- 
- outWait:
--   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
-+   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
- out:
-    release_sock(sk);
-    return err;
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
deleted file mode 100644
index abbaa5d9e287..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.26.ebuild,v 1.4 2010/11/05 16:27:29 lxnay 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
-	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}-makefile-include.patch"
-	epatch "${FILESDIR}/apic.patch"
-	kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-iommu_map.patch"
-	kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
-	kernel_is ge 2 6 36 && epatch "${FILESDIR}/${PV}-ioctl-2.6.36.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
-}