d_make_root patch for 3.4 kernel. Bug 411853.

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

4 files changed, 26 insertions, 4 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index cc6de8c6524a..6e5e6a94ddb1 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.93 2012/05/07 13:19:52 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.94 2012/05/22 14:03:20 vadimk Exp $
+
+  22 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/264-d-make-root.patch,
+  vmware-modules-264.3.ebuild:
+  d_make_root patch for 3.4 kernel. Bug 411853.
 
   07 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/264-apic.patch:
   missing patch. Bug 414831
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 2dd1530d59c1..0f4e6319d8d7 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -8,12 +8,13 @@ AUX 238-sema.patch 3621 RMD160 c1710c17094f21bdc31190975a29421055cb85a8 SHA1 960
 AUX 238-unlocked_ioctl.patch 1114 RMD160 9e837ff627f539e70fd0c110b17d5dd606dea9ea SHA1 0b1f11171a9d76a42ebf768557dc2e28152bc77a SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458
 AUX 264-3.2.0.patch 2949 RMD160 e343db72eeb80e43ab5fbd5b4c2efebcb81c2c5e SHA1 bf88b0be9fcdc9705de846452d44833e0b146c11 SHA256 4105952362a9bf8a054df1c23f2562e86f79b3bef70696422548c01db248c1b0
 AUX 264-apic.patch 302 RMD160 9874eda6ee3d291babbca35772512d5cc90a7c53 SHA1 60ad4c2c96b7e2c13817775424775edadd0dfd84 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048
+AUX 264-d-make-root.patch 519 RMD160 18df464ef7cb96666ad6c62e156181921f8467cc SHA1 457e47d03aa1f6dacb74139e430e6b8cdf557717 SHA256 aad9819961203f4d2e65532567b4f5b485bb583f1a2f322e84919d95505ed0f1
 AUX 264-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
 AUX 264-makefile-include.patch 2501 RMD160 da46f1229097539c7272d421f4d50b322e4d6e28 SHA1 30b57e8033e49eaf4923a4032765950e684533fc SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169
 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-264.3.ebuild 2057 RMD160 69b7b6b8ff6de11a6ea902d32de31ddda18c11f8 SHA1 d7a83f845303d683d02c724f87ee19bcfce19d43 SHA256 5acd4578b825e9cc500913d78e0c66d4478ee7835f84d9dc1a7a55af4956722a
-MISC ChangeLog 20603 RMD160 614b6787091aa212eedbc6ac527adde7cd4ab9cc SHA1 9ee851076f3770700d76086f9cf37479836a9ca3 SHA256 dc35a142276badc78ebfb46622247f19abcd7b9aaf83553131571fb313c9b13f
+EBUILD vmware-modules-264.3.ebuild 2109 RMD160 9d3613972b82651345f07eddb051e2827d8cdfa5 SHA1 9d80c9388d0719152f11fa6be8cc3f1546d30b80 SHA256 9682120bb9d7c0ffba9d619b4482ad321c3d44bb27683d3ca28585702592aefb
+MISC ChangeLog 20762 RMD160 5c05baf11297983f4a71630fa8f629e8a1cfcc8b SHA1 dbb0f87d6c0294c516782af8d1f9c200a0f734e9 SHA256 387ae2cf7bfe664dd5843b27333108977ad3db71ed0da6d966e138ac721ce898
 MISC metadata.xml 382 RMD160 7f2589a01d5c18452da9fafb241da71ab5c9e73b SHA1 837d9a7599cadede8b02c918313680b0e1ffb33a SHA256 1d7ec802d18a99c79283d3c21dd905ca3e74738bf8627e16412a67ce0af50361
diff --git a/app-emulation/vmware-modules/files/264-d-make-root.patch b/app-emulation/vmware-modules/files/264-d-make-root.patch
new file mode 100644
index 000000000000..a02e4ce0c39e
--- /dev/null
+++ b/app-emulation/vmware-modules/files/264-d-make-root.patch
@@ -0,0 +1,16 @@
+diff --git a/vmblock-only/linux/filesystem.c b/vmblock-only/linux/filesystem.c
+index b7c535e..a36a01e 100644
+--- a/vmblock-only/linux/filesystem.c
++++ b/vmblock-only/linux/filesystem.c
+@@ -525,7 +525,11 @@ FsOpReadSuper(struct super_block *sb, // OUT: Superblock object
+       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-264.3.ebuild b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
index 45cbd8c95e49..73619d536f37 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.3.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-264.3.ebuild,v 1.1 2012/05/05 14:51:31 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.3.ebuild,v 1.2 2012/05/22 14:03:20 vadimk Exp $
 
 EAPI="4"
 
@@ -66,6 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
 }
 
 src_install() {