Andrew Dean's patch of 238 vmware modules for 3.4.0 kernel. Bug 411853

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

4 files changed, 24 insertions, 4 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 6e5e6a94ddb1..1ae482a9195b 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.94 2012/05/22 14:03:20 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.95 2012/05/24 17:36:05 vadimk Exp $
+
+  24 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/238-d-make-root.patch,
+  vmware-modules-238.5-r1.ebuild:
+  Andrew Dean's patch of 238 vmware modules for 3.4.0 kernel. Bug 411853
 
   22 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/264-d-make-root.patch,
   vmware-modules-264.3.ebuild:
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 0f4e6319d8d7..768a1ddf7295 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,5 +1,6 @@
 AUX 238-2.6.39.patch 8566 RMD160 1fb07e92cebba852da61b36ee10dcdb4e12d5729 SHA1 6098b91349ab7bc128fea3df27671423f5ddcd1a SHA256 31e68e9897660cc8ff898eae1d722d616205fff1efd30cd8e042a3a455bd2350
 AUX 238-3.2.0.patch 3533 RMD160 e7928a853397dd5f01b46022e2abdd24c440c4b1 SHA1 bb91934f89cabb305ad9df6d6f5df3fa4f32f900 SHA256 df2bf5a026281559ba6e0d364555c8f48024b7ce2231c652960b5c477cc4545a
+AUX 238-d-make-root.patch 418 RMD160 2bde1f49077533aa6c2d96fbc3a849990a692bdc SHA1 a04267f7fb0cfc723890cec0a5c68d2660c96f26 SHA256 097a4be57e19b9342d2aab6d2f354969dd7e596efeef60465fd9bf818dadcd8a
 AUX 238-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
 AUX 238-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c
 AUX 238-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
@@ -14,7 +15,7 @@ AUX 264-makefile-include.patch 2501 RMD160 da46f1229097539c7272d421f4d50b322e4d6
 AUX 264-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
 AUX 264-netdevice.patch 833 RMD160 552fa78378ac721865a0629a4a29318a11e6b1bd SHA1 16d95a575ea14de67d11f4faf72842c3edb96dea SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751
 AUX hardened.patch 5052 RMD160 818caeb51a5fa7aae556e465beadc0ff684b54a7 SHA1 8a5feac39756fd476c087af247e853b0321a4823 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6
-EBUILD vmware-modules-238.5-r1.ebuild 2090 RMD160 26667de2925997236de3b67f50713a65c445da33 SHA1 055681012a1b29f288068c6f93bd7a89a1693ffe SHA256 f92ba59b5184cbbd3d9fa380bb5b480ccf3a34b6688263baa3756be6888281cb
+EBUILD vmware-modules-238.5-r1.ebuild 2142 RMD160 fc4b5fda4f7b37d24dd20ba59fc6f9e09adfbee0 SHA1 000c1dcb8576f62c54d5ec45c3abcef9ba4f7684 SHA256 e7780f0a975a0a4a2b1d1b016ca5241663f745bffc1e86955991bb531b033611
 EBUILD vmware-modules-264.3.ebuild 2109 RMD160 9d3613972b82651345f07eddb051e2827d8cdfa5 SHA1 9d80c9388d0719152f11fa6be8cc3f1546d30b80 SHA256 9682120bb9d7c0ffba9d619b4482ad321c3d44bb27683d3ca28585702592aefb
-MISC ChangeLog 20762 RMD160 5c05baf11297983f4a71630fa8f629e8a1cfcc8b SHA1 dbb0f87d6c0294c516782af8d1f9c200a0f734e9 SHA256 387ae2cf7bfe664dd5843b27333108977ad3db71ed0da6d966e138ac721ce898
+MISC ChangeLog 20949 RMD160 3a3edf2ebd75b6e3e9a74b87b53223ea9cd35a77 SHA1 81be9797d111202b0fa1032052d784374895cbe0 SHA256 4840f78a53c3f631cbbfc7cfa1bf9f15733577f32d07add559754d42933f0ef9
 MISC metadata.xml 382 RMD160 7f2589a01d5c18452da9fafb241da71ab5c9e73b SHA1 837d9a7599cadede8b02c918313680b0e1ffb33a SHA256 1d7ec802d18a99c79283d3c21dd905ca3e74738bf8627e16412a67ce0af50361
diff --git a/app-emulation/vmware-modules/files/238-d-make-root.patch b/app-emulation/vmware-modules/files/238-d-make-root.patch
new file mode 100644
index 000000000000..7e83a1e91092
--- /dev/null
+++ b/app-emulation/vmware-modules/files/238-d-make-root.patch
@@ -0,0 +1,14 @@
+--- a/vmblock-only/linux/filesystem.c	2012-05-23 20:08:00.632051396 -0500
++++ b/vmblock-only/linux/filesystem.c	2012-05-23 20:17:00.896297163 -0500
+@@ -517,7 +517,11 @@
+       return -EINVAL;
+    }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+    rootDentry = d_alloc_root(rootInode);
++#else
++   rootDentry = d_make_root(rootInode);
++#endif
+    if (!rootDentry) {
+       iput(rootInode);
+       return -ENOMEM;
diff --git a/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
index b812d92d2ece..83214838cf4e 100644
--- a/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild,v 1.1 2012/03/26 16:14:40 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild,v 1.2 2012/05/24 17:36:05 vadimk Exp $
 
 EAPI="2"
 
@@ -66,6 +66,7 @@ src_prepare() {
 	kernel_is ge 2 6 39 && epatch "${FILESDIR}/${PV_MAJOR}-2.6.39.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
 }
 
 src_install() {