unlocked_ioctl patch

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

5 files changed, 126 insertions, 5 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index bc067f834735..ec48f9cc4760 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.61 2010/11/21 15:44:04 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.62 2010/11/21 15:58:59 vadimk Exp $
+
+*vmware-modules-1.0.0.24-r2 (21 Nov 2010)
+
+  21 Nov 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  +files/1.0.0.24-unlocked_ioctl.patch, +vmware-modules-1.0.0.24-r2.ebuild,
+  vmware-modules-1.0.0.25-r2.ebuild:
+  unlocked_ioctl patch
 
 *vmware-modules-1.0.0.25-r2 (21 Nov 2010)
 
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 4e8b122a66d6..5ee98cba5f43 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -3,6 +3,7 @@ AUX 1.0.0.24-kernel-2.6.29.patch 10343 RMD160 4c93cab9f129a279671aa82af989121b3b
 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-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
 AUX 1.0.0.25-autoconf-generated.patch 17674 RMD160 38343d24d8cdfd7e312f3e60cf87f7236da6df22 SHA1 6e427c26f1a1efafff4a1c8623ef9ada874540e5 SHA256 d35b879cb950373939d3cef32e56be87f5b216ece3fe12af5e04c2c7c146a394
 AUX 1.0.0.25-makefile-include.patch 3185 RMD160 a3aa2f7cb3a51c96be13080061543d9664d98096 SHA1 df61745eeb49f517a9b7fb882ec0baab772544dd SHA256 50b529606062794d90083a590e05966b3420f1f9c6648863bd0ff360c17d9b34
@@ -28,7 +29,8 @@ DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e0588
 EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7
 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.25-r1.ebuild 2050 RMD160 b1d2772dedb71ec8351e1c58b131f671bfc02b4c SHA1 cd4995359b2192465eb6b6f4cfdef19d0f911683 SHA256 c323e7b3081a65d9f67d351d5f1976c2204160e164b4d5039bfb3002263ffe61
-EBUILD vmware-modules-1.0.0.25-r2.ebuild 2066 RMD160 bdc917f0939875300dcc17b6170b6dd665464161 SHA1 38a8cba00ef568ed8c33f645662bd28068911c52 SHA256 55b5e7cf4f105970bf152edc8a97f9381a57e6daeaa3679ecd46677c71bbe158
-MISC ChangeLog 14064 RMD160 efa055081a463260cf081b6b018e54ce666bbf29 SHA1 2a1e5c46fff81ef20d52a6797dd18f23ca8c0b61 SHA256 b5945df44b94a008b2ea43d7e415fa938ec2e3fcdef81141920cab10748e76d3
+EBUILD vmware-modules-1.0.0.25-r2.ebuild 2066 RMD160 61df9dc743fda05f5a436f5754ca33b96010114f SHA1 0a900ee13fd0eabe3f1d3150063ca54ac70b965f SHA256 f0af4be70228c91294920552af23618f4b97531aff35c487920af43767f77ed2
+MISC ChangeLog 14295 RMD160 6a62b1e23271f1849e1f6180bc672541250f77f0 SHA1 905137f0dbbd5e5f0b46c46c3a9d593841cc3cbd SHA256 7c00a6c5df7d5d84199730659abff5eb94f692ceb1264e36b3ef21dfcd8e475a
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
diff --git a/app-emulation/vmware-modules/files/1.0.0.24-unlocked_ioctl.patch b/app-emulation/vmware-modules/files/1.0.0.24-unlocked_ioctl.patch
new file mode 100644
index 000000000000..f6250dc2e72f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.24-unlocked_ioctl.patch
@@ -0,0 +1,33 @@
+diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
+index 3cd4923..0d4f6df 100644
+--- a/vmmon-only/linux/driver.c
++++ b/vmmon-only/linux/driver.c
+@@ -170,6 +170,7 @@ static int LinuxDriver_Open(struct inode *inode, struct file *filp);
+ static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
+                            u_int iocmd, unsigned long ioarg);
+ #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
++#define VMW_HAVE_UNLOCKED_IOCTL
+ static long LinuxDriver_UnlockedIoctl(struct file *filp,
+                            u_int iocmd, unsigned long ioarg);
+ #endif
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+index c83628d..eb4a707 100644
+--- a/vmmon-only/linux/hostif.c
++++ b/vmmon-only/linux/hostif.c
+@@ -3411,7 +3413,7 @@ HostIFDoIoctl(struct file *filp,
+    if (filp->f_op->unlocked_ioctl) {
+       return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
+    }
+-#endif
++#else
+    if (filp->f_op->ioctl) {
+       long err;
+ 
+@@ -3420,6 +3422,7 @@ HostIFDoIoctl(struct file *filp,
+       unlock_kernel();
+       return err;
+    }
++#endif
+    return -ENOIOCTLCMD;
+ }
+ 
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r2.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r2.ebuild
new file mode 100644
index 000000000000..e8cc64460698
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r2.ebuild
@@ -0,0 +1,79 @@
+# 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-r2.ebuild,v 1.1 2010/11/21 15:58:59 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"
+}
+
+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-r2.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r2.ebuild
index 0fc78d71e3e6..85c24384fe9f 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2010/11/21 15:44:04 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r2.ebuild,v 1.2 2010/11/21 15:58:59 vadimk Exp $
 
 EAPI="2"
 
@@ -62,7 +62,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
 	epatch "${FILESDIR}/apic.patch"
 	kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
-	kernel_is ge 2 6 35 && epatch "${FILESDIR}/${PV}-unlocked_ioctl.patch"
+	kernel_is ge 2 6 36 && epatch "${FILESDIR}/${PV}-unlocked_ioctl.patch"
 
 }