Bugs 345145, 351592.

Package-Manager: portage-2.1.9.31/cvs/Linux x86_64

5 files changed, 185 insertions, 5 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index a23df60cf1b6..c156760dc062 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.63 2011/01/13 21:01:38 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.64 2011/01/15 15:49:07 vadimk Exp $
+
+*vmware-modules-1.0.0.24-r3 (15 Jan 2011)
+
+  15 Jan 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/1.0.0.24-sema.patch,
+  +vmware-modules-1.0.0.24-r3.ebuild:
+  Bugs 345145, 351592.
+  Thanks Mateusz Dziadko, c1pher.
 
 *vmware-modules-1.0.0.25-r3 (13 Jan 2011)
 
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index ff3995a1c984..3bd1a75c92cd 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -2,6 +2,7 @@ AUX 1.0.0.24-autoconf-generated.patch 18142 RMD160 05064550c8f4308bf803298500dec
 AUX 1.0.0.24-kernel-2.6.29.patch 10343 RMD160 4c93cab9f129a279671aa82af989121b3bf1f191 SHA1 1fcd62b30ca2a15c82ffc82924eef3447a4a4e08 SHA256 7bda64e6c0fb2fd30f71b38fa0920169356913e17bb8802ffc1e57622a0dd79c
 AUX 1.0.0.24-kernel-2.6.30.patch 1062 RMD160 8c02543ffcd46db13f179a63c589315f103b6c22 SHA1 f4d8030f1197788d9e2263ab4e3e861652702cd3 SHA256 deef76da29aec2aff33a0fe816faa1c4b61cb27858cdd6c1af70f9eaf9cde158
 AUX 1.0.0.24-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
+AUX 1.0.0.24-sema.patch 3756 RMD160 b182d2aa998c61afc28c68e2b859fbb894ccd550 SHA1 9cb8bcee24e294ed8dbd5f27c8160186c8c6d1fe SHA256 2fe6190be73b29b29f99e8a0c74f2b34213cd394a11aef5866a957851cc37b03
 AUX 1.0.0.24-sk_sleep.patch 2953 RMD160 2d71cd394b8a46510a4e3ecc0923e6dfda5e7cd6 SHA1 bbc2ccd8aa45572013f67adb5fcac70c9e76fc1c SHA256 01cec0a08b94771d40dedad4c4e9970c16d8c25e5cc08630786cc1343ead7cc6
 AUX 1.0.0.24-unlocked_ioctl.patch 1136 RMD160 a5ae0ebd54acac07144ab1510a04ebb7cabc0598 SHA1 177c3cf965d2c83084696f8132f6c7cd6ab82a2d SHA256 0bad0f0848772ec64d40a15a48c8f9d37212dd93b243e4cc5f1172371e7fbf14
 AUX 1.0.0.24-vmnet-2.6.31.patch 13974 RMD160 84af8197b341ccea2fdda39225f9259ccdbb4a2d SHA1 745c973cce7c220f2f5d6853d5ede61738fdd729 SHA256 b8391b3ecb7a15c1763b2eace1e747f73f8ace3c1125b5402b8662d7b29298b5
@@ -27,12 +28,13 @@ DIST vmware-modules-1.0.0.24.amd64.tar.bz2 486925 RMD160 64e81b90f9e838100bdc4e9
 DIST vmware-modules-1.0.0.24.x86.tar.bz2 487178 RMD160 9dd4aa6ecabe1ff1621e0a7a9c573479ab92df3c SHA1 e861a6c2d33193a57226a9be562e9e7a1926e45f SHA256 0021b2eefdfb2de3d352d70f84f1e9ec3d375e1073c5f960435208cf3ee2409e
 DIST vmware-modules-1.0.0.25.amd64.tar.bz2 488816 RMD160 deb03d08b8cf1cad03967b3e1b0e98fc2649fd90 SHA1 00adbde24d72455837b5b81db49bc6a6390973d8 SHA256 f4c0baf981151ad3dbdbae104952983d44d83121048ecd7b88b8b34368dd05b7
 DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e058814597d4cfa2ca27 SHA1 155bccf1f27e6aecc765980443b6351e6ae15028 SHA256 ee794a0b714173a91bb523290a579306845f7af9696e5a274745d45c37f1f0e8
-EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7
+EBUILD vmware-modules-1.0.0.15-r1.ebuild 316 RMD160 b91d22bbc959de5b6dc0fd77c3d85c4b2c42eb4b SHA1 99904f20a0f0bdea7ae39df808e3ca37f7539b4a SHA256 fd790cc61a1c33ecba3cc771682ae8a828113687be4e8ab80ccf7c7cf31dd452
 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d
 EBUILD vmware-modules-1.0.0.24-r1.ebuild 2059 RMD160 b7e8ec8509cec3df79a1e1c60e9f7ce6a7063402 SHA1 b14b5b4c02c93990e0ce94105a236bbc7559c474 SHA256 7afef8c3b65c858fca15174f81432537e8a04dd1bb0ff0bfcfdf61de4dbfd0f6
 EBUILD vmware-modules-1.0.0.24-r2.ebuild 2134 RMD160 51e738688f0ed1c4639f60463cea5c10e73371d1 SHA1 0b1dcb90606ee8c5bcc8dcb8e428bee0b04ece88 SHA256 fb0856fd9851d77c5bccc8cec51409c539441b9edb689822c12e8ec1be53b8e4
+EBUILD vmware-modules-1.0.0.24-r3.ebuild 2296 RMD160 f37d356cac45d3ffa5e88e3f26e3230a795848bf SHA1 5864bca32a26f16946b25747ba4b35092749932a SHA256 1868e4df926e3a82621afb4dc8f1eb62e90a36d4caff2b710d93b5d809ee69ef
 EBUILD vmware-modules-1.0.0.25-r1.ebuild 2050 RMD160 b1d2772dedb71ec8351e1c58b131f671bfc02b4c SHA1 cd4995359b2192465eb6b6f4cfdef19d0f911683 SHA256 c323e7b3081a65d9f67d351d5f1976c2204160e164b4d5039bfb3002263ffe61
 EBUILD vmware-modules-1.0.0.25-r2.ebuild 2066 RMD160 91d8a8c0f3dbcaa4e8a9274e1bfac34e47065f74 SHA1 c0c3fd0fec19c7d17e0f612b85e5bbd83e9f1b9a SHA256 9c640a96c300f8d0be19d7fcf23f426810f1456e9103c082a78910ae981d732b
 EBUILD vmware-modules-1.0.0.25-r3.ebuild 2226 RMD160 94759d4c7982b0a4ac12116716c910c96608f889 SHA1 13ed9b7acc20ed015ee5b184abe388aa42719cad SHA256 e1fd5f8ddae62547fe9254fdf5c0b08722f738534fd72297162c819154058b67
-MISC ChangeLog 14547 RMD160 06959023c20e6e6268f98bfff5ebbedacaef9eb7 SHA1 426e60845108c8c5f4da6caa55e18c606a0a5f8a SHA256 1df9ad7e2f5939bb1b82b618d75ff2e382c59d974a4664972d7d3fc669160696
+MISC ChangeLog 14765 RMD160 213d77dff71cee7a143359470628a9c7d6cf0b1d SHA1 2fbeb1d725f6a8f8c445b891568dfe20a53d14b5 SHA256 7031352effccf1c9006e9ffb0bdf2f7681b7394abfeab0d8eab58a855cad8e8c
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
diff --git a/app-emulation/vmware-modules/files/1.0.0.24-sema.patch b/app-emulation/vmware-modules/files/1.0.0.24-sema.patch
new file mode 100644
index 000000000000..f5b06f3ccc0a
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.24-sema.patch
@@ -0,0 +1,87 @@
+diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmci-only/include/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmci-only/include/compat_semaphore.h
+--- vmware-modules-1.0.0.25-r2.orig/work/vmci-only/include/compat_semaphore.h	2011-01-11 21:55:57.016999997 +0100
++++ vmware-modules-1.0.0.25-r2/work/vmci-only/include/compat_semaphore.h	2011-01-11 21:57:39.719999997 +0100
+@@ -45,5 +45,13 @@
+    #endif
+ #endif
+ 
++#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++   #ifndef DECLARE_MUTEX
++      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
++   #endif
++   #ifndef init_MUTEX
++      #define init_MUTEX(_m) sema_init(_m,1)
++   #endif
++#endif
+ 
+ #endif /* __COMPAT_SEMAPHORE_H__ */
+diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmmon-only/include/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmmon-only/include/compat_semaphore.h
+--- vmware-modules-1.0.0.25-r2.orig/work/vmmon-only/include/compat_semaphore.h	2011-01-11 21:55:57.028999997 +0100
++++ vmware-modules-1.0.0.25-r2/work/vmmon-only/include/compat_semaphore.h	2011-01-11 21:58:57.529999998 +0100
+@@ -45,5 +45,13 @@
+    #endif
+ #endif
+ 
++#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++   #ifndef DECLARE_MUTEX
++      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
++   #endif
++   #ifndef init_MUTEX
++      #define init_MUTEX(_m) sema_init(_m,1)
++   #endif
++#endif
+ 
+ #endif /* __COMPAT_SEMAPHORE_H__ */
+diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmnet-only/compat_semaphore.h
+--- vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/compat_semaphore.h	2011-01-11 21:55:57.022999997 +0100
++++ vmware-modules-1.0.0.25-r2/work/vmnet-only/compat_semaphore.h	2011-01-11 21:58:23.678999996 +0100
+@@ -45,5 +45,14 @@
+    #endif
+ #endif
+ 
++#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++   #ifndef DECLARE_MUTEX
++      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
++   #endif
++   #ifndef init_MUTEX
++      #define init_MUTEX(_m) sema_init(_m,1)
++   #endif
++#endif
++
+ 
+ #endif /* __COMPAT_SEMAPHORE_H__ */
+diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/vnetFilter.h vmware-modules-1.0.0.25-r2/work/vmnet-only/vnetFilter.h
+--- vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/vnetFilter.h	2011-01-11 21:55:57.020999997 +0100
++++ vmware-modules-1.0.0.25-r2/work/vmnet-only/vnetFilter.h	2011-01-11 22:02:29.522999997 +0100
+@@ -203,5 +203,13 @@
+ } 
+ #include "vmware_pack_end.h"
+ VNet_SetLogLevel;
++#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++   #ifndef DECLARE_MUTEX
++      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
++   #endif
++   #ifndef init_MUTEX
++      #define init_MUTEX(_m) sema_init(_m,1)
++   #endif
++#endif
+ 
+ #endif // ifndef _VNETFILTER_H_
+diff -ru vmware-modules-1.0.0.25-r2.orig/work/vsock-only/linux/af_vsock.h vmware-modules-1.0.0.25-r2/work/vsock-only/linux/af_vsock.h
+--- vmware-modules-1.0.0.25-r2.orig/work/vsock-only/linux/af_vsock.h	2011-01-11 21:55:57.040999997 +0100
++++ vmware-modules-1.0.0.25-r2/work/vsock-only/linux/af_vsock.h	2011-01-11 22:03:59.066999997 +0100
+@@ -88,4 +88,14 @@
+ #endif
+ } VSockVmciSock;
+ 
++#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++   #ifndef DECLARE_MUTEX
++      #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
++   #endif
++   #ifndef init_MUTEX
++      #define init_MUTEX(_m) sema_init(_m,1)
++   #endif
++#endif
++
++
+ #endif /* __AF_VSOCK_H__ */
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild
index 1c8274ea4e12..647e684b117e 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 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.15-r1.ebuild,v 1.4 2007/07/12 06:39:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild,v 1.5 2011/01/15 15:49:07 vadimk Exp $
 
 KEYWORDS="amd64 x86"
 VMWARE_VER="VME_S1B1"
+IUSE=""
 
 inherit vmware-mod
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r3.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r3.ebuild
new file mode 100644
index 000000000000..715c3e7a994b
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 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-r3.ebuild,v 1.1 2011/01/15 15:49:07 vadimk 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}-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"
+	epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
+	kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
+	kernel_is ge 2 6 36 && epatch "${FILESDIR}/${PV}-unlocked_ioctl.patch"
+	kernel_is 2 6 37 && epatch "${FILESDIR}/${PV}-sema.patch"
+
+	sed -i -e 's/make/$(MAKE)/g' {vmmon,vsock,vmblock,vmnet,vmci}-only/Makefile \
+		|| die "Sed failed."
+}
+
+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
+}