diff options
| author |   Vadim Kuznetsov <vadimk@gentoo.org> | 2011-04-09 11:51:54 +0000 |
|---|---|---|
| committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2011-04-09 11:51:54 +0000 |
| commit | 36af134f241efb27612816f3143c1962ac91959c (patch) | |
| tree | 0c4eb41a42127c6f759f5989695eabfc2c4754c7 /app-emulation/vmware-modules | |
| parent | removed old version (diff) | |
| download | historical-36af134f241efb27612816f3143c1962ac91959c.tar.gz historical-36af134f241efb27612816f3143c1962ac91959c.tar.bz2 historical-36af134f241efb27612816f3143c1962ac91959c.zip | |
1.0.0.24 removed. It's replaced by 208.2
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/vmware-modules')
11 files changed, 13 insertions, 1787 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index f39294ac2fd2..cd6771aebc3c 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,14 @@ # 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.75 2011/03/30 14:48:33 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.76 2011/04/09 11:51:54 vadimk Exp $ + + 09 Apr 2011; Vadim Kuznetsov <vadimk@gentoo.org> + -files/1.0.0.24-autoconf-generated.patch, + -files/1.0.0.24-kernel-2.6.29.patch, -files/1.0.0.24-kernel-2.6.30.patch, + -files/1.0.0.24-makefile-kernel-dir.patch, -files/1.0.0.24-sema.patch, + -files/1.0.0.24-sk_sleep.patch, -files/1.0.0.24-vmnet-2.6.31.patch, + -files/1.0.0.24-unlocked_ioctl.patch, -vmware-modules-1.0.0.24-r3.ebuild: + 1.0.0.24 is replaced by 208.2 30 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> files/208-sema.patch: corrected sema patch diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index b6ebfec2ba53..b021223d546c 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -1,14 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 1.0.0.24-autoconf-generated.patch 18142 RMD160 05064550c8f4308bf803298500deca0dec0585d0 SHA1 fb13499b017395d7bc4e18ca71f6c683f68e70de SHA256 9d7421c57ed8da0b172532d30db6e938b18a6f30e39c725a6fc515a7feddcd13 -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 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 AUX 1.0.0.25-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f @@ -25,22 +17,19 @@ AUX 238-sema.patch 3621 RMD160 c1710c17094f21bdc31190975a29421055cb85a8 SHA1 960 AUX 238-unlocked_ioctl.patch 1114 RMD160 9e837ff627f539e70fd0c110b17d5dd606dea9ea SHA1 0b1f11171a9d76a42ebf768557dc2e28152bc77a SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458 AUX apic.patch 294 RMD160 ab0d6fea359f66ccd735cd3bc830442f6f6baa39 SHA1 537f1a903b94ea379003cf4e50c9507ae403c595 SHA256 6902f8dd82d48f479a3e5647e3bd7125d073f242dd85a5b2ddfd51f4ea8f663c AUX sched_h-2.6.32.patch 819 RMD160 99c136ee407b892f018a9899944c73de11a6fc17 SHA1 1cd7ace0046185c069bee3f47003c7fd7a931766 SHA256 925310d18016bc5638c6a9cc8888b5b2dd5d884890386a358c6f6f527788aaa4 -DIST vmware-modules-1.0.0.24.amd64.tar.bz2 486925 RMD160 64e81b90f9e838100bdc4e901021a86433efeed8 SHA1 bbbf3974afcb77fa0a670ac7821382a725cc6e4e SHA256 d010d0797bc303d2e3a69efc17dca56d3e3de5c43028c780334c57c69606ab94 -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 DIST vmware-modules-208.2.patch.bz2 7239 RMD160 f66781709bb18dc370717c32fa72b2907f0e2b11 SHA1 4fece02cd13f8bafdc62562d2f8e2a4cc66c75a1 SHA256 7b1d16163626b2ea2c1bba82a537368e2f758356580044480994b1fbe0073b47 -EBUILD vmware-modules-1.0.0.24-r3.ebuild 2299 RMD160 508a2a9420f203912e53ddf2ea766d229de7d0c5 SHA1 0d9b5a93aaa26fc25c308c8f2557f681418ad938 SHA256 220aff5eb5acad0247059a2bec788494bc7dc4327bd35bf0c3eea92a68efadb2 EBUILD vmware-modules-1.0.0.25-r3.ebuild 2227 RMD160 eee9311501d439b63d1b657f064000c106d4e9c2 SHA1 1e3da5f429c8f04d1b3e46cb7a98171cec30d490 SHA256 3124c8b65f4245069305d5c541da8b1dd318e621f752ec8963fc285a4cae84ea EBUILD vmware-modules-1.0.0.25-r4.ebuild 2242 RMD160 4815c0ce9280c6bb71ed8d18df9da5a5a7a2e1b9 SHA1 eccd85cb86a6cd45aa254cbada7a65557f3a72fb SHA256 f492d54e11193dfa54a0e712e3742c984c3a30f7a2a6eb68e0c82881ba55d342 EBUILD vmware-modules-208.2.ebuild 1855 RMD160 a42bdef87a95590f779272fe8037d528d9bb6a5c SHA1 83d002b0c1432baab071dcd44a41907dfeb52c70 SHA256 e8452a07897634bbb71bae4afec2c28982223727ec9246b30882705f6ce08f43 EBUILD vmware-modules-238.3-r8.ebuild 2003 RMD160 54ebdf4d11c0059d89a34c1a3b2f6646aacf31c8 SHA1 ca4bdac450b1e90f0cbb5827787d46e86bc22017 SHA256 2585f5fc1de6fb1e2c50fa2a61dd538b43dc5b9af1f9b5133b8b8ef1bafecf45 -MISC ChangeLog 17108 RMD160 a299269b0ab6aaddd72d0f9eaf0da67ccf20acf7 SHA1 5f265ce93922bbd2d207c2944690099e1e0eeaee SHA256 f5a08aadbbf25aa3ba2b53af5e90bd54bb40f9d0b96b4399bbb300e871bcfc30 +MISC ChangeLog 17531 RMD160 7038b6167578b83aa2a052c797b1e725a744f312 SHA1 0e10d98a907b6643fcd34b705d81bef6dc3cc19a SHA256 27e3f84275444840853cea8ce0fd16712f56d05288ac9ebc87dbcd064140a372 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2TQ14ACgkQiLKviuHfItVvQACeK3MFxypSe6uQ5jkwHrX5xz79 -1oMAnjQVFYyIH6frgMMVND++KBTLeqQq -=kNxH +iEYEARECAAYFAk2gSQYACgkQiLKviuHfItVmMACfegOQXVvPZgypvVNQC75fmv/7 +VZMAnA9RV+qwqmBuJ6dq4I5yiQMi6czj +=STC7 -----END PGP SIGNATURE----- diff --git a/app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch b/app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch deleted file mode 100644 index 031fe46de92c..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch +++ /dev/null @@ -1,598 +0,0 @@ ---- vmblock-only/autoconf/cachecreate.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/cachecreate.c.new 2010-02-05 23:29:47.077574422 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * All kernels before 2.6.22 take 6 arguments. All kernels since ---- vmblock-only/autoconf/cachector.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/cachector.c.new 2010-02-05 23:32:39.086240477 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * Between 2.6.23 and 2.6.24-rc1 ctor prototype was changed from ---- vmblock-only/autoconf/cachector1.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/cachector1.c.new 2010-02-05 23:33:57.863050887 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * Between 2.6.27-rc1 and 2.6.27-rc2 ctor prototype was changed from ---- vmblock-only/autoconf/epoll.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/epoll.c.new 2010-02-05 23:34:03.782195888 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vmblock-only/autoconf/filldir1.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/filldir1.c.new 2010-02-05 23:34:09.582480900 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) - #include <linux/fs.h> ---- vmblock-only/autoconf/geninclude.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/geninclude.c.new 2010-02-05 23:34:16.775702411 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vmblock-only/autoconf/getsb1.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/getsb1.c.new 2010-02-05 23:34:21.727106345 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - ---- vmblock-only/autoconf/setnice.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/setnice.c.new 2010-02-05 23:34:27.326719885 +0100 -@@ -20,8 +20,12 @@ - * set_user_nice appeared in 2.4.21. But some distros - * backported it to older kernels. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) - #include <linux/sched.h> ---- vmblock-only/autoconf/statfs1.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/statfs1.c.new 2010-02-05 23:34:34.998496715 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - #include <linux/fs.h> ---- vmblock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vmblock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* ---- vmci-only/autoconf/epoll.c 2009-03-27 06:34:31.000000000 +0100 -+++ vmci-only/autoconf/epoll.c.new 2010-02-05 23:38:31.793973380 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vmci-only/autoconf/geninclude.c 2009-03-27 06:34:31.000000000 +0100 -+++ vmci-only/autoconf/geninclude.c.new 2010-02-05 23:38:45.704327021 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vmci-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vmci-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* ---- vmmon-only/autoconf/epoll.c 2010-02-05 23:39:45.361576611 +0100 -+++ vmmon-only/autoconf/epoll.c.new 2010-02-05 23:40:41.241245910 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vmmon-only/autoconf/geninclude.c 2010-02-05 23:39:45.362577852 +0100 -+++ vmmon-only/autoconf/geninclude.c.new 2010-02-05 23:40:50.833402279 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vmmon-only/autoconf/nopage1.c 2010-02-05 23:39:45.363577625 +0100 -+++ vmmon-only/autoconf/nopage1.c.new 2010-02-05 23:40:58.674161808 +0100 -@@ -21,8 +21,12 @@ - * it uses new prototype. For 2.6.1 (and its -rc) and older do - * compile test. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2) - #include <linux/mm.h> ---- vmmon-only/autoconf/setnice.c 2010-02-05 23:39:45.363577625 +0100 -+++ vmmon-only/autoconf/setnice.c.new 2010-02-05 23:41:12.017985901 +0100 -@@ -20,8 +20,12 @@ - * set_user_nice appeared in 2.4.21. But some distros - * backported it to older kernels. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) - #include <linux/sched.h> ---- vmmon-only/autoconf/smpcall.c 2010-02-05 23:39:45.364577754 +0100 -+++ vmmon-only/autoconf/smpcall.c.new 2010-02-05 23:40:25.057954672 +0100 -@@ -21,8 +21,12 @@ - * Change happened between 2.6.26 and 2.6.27-rc1. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) - # error This compile test intentionally fails. ---- vmmon-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vmmon-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* ---- vmnet-only/epoll.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/epoll.c.new 2010-02-05 23:43:43.642940246 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vmnet-only/geninclude.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/geninclude.c.new 2010-02-05 23:43:52.931081128 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vmnet-only/netdev_has_dev_net.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/netdev_has_dev_net.c.new 2010-02-05 23:44:11.315557541 +0100 -@@ -21,8 +21,12 @@ - * It appeared between 2.6.25 and 2.6.26-rc1. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) - # error This compile test intentionally fails. ---- vmnet-only/netdev_has_net.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/netdev_has_net.c.new 2010-02-05 23:44:29.348948588 +0100 -@@ -27,8 +27,12 @@ - * as hopefully in few weeks all 2.6.24-rc1 users will be gone. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) - # error This compile test intentionally fails. ---- vmnet-only/nfhook_uses_skb.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/nfhook_uses_skb.c.new 2010-02-05 23:44:35.228702615 +0100 -@@ -23,8 +23,12 @@ - * 2.6.24-rc1. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) - # error This compile test intentionally fails. ---- vmnet-only/setnice.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/setnice.c.new 2010-02-05 23:44:45.613286546 +0100 -@@ -20,8 +20,12 @@ - * set_user_nice appeared in 2.4.21. But some distros - * backported it to older kernels. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) - #include <linux/sched.h> ---- vmnet-only/sk_alloc.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/sk_alloc.c.new 2010-02-05 23:44:59.796490045 +0100 -@@ -21,8 +21,12 @@ - * This API change was introduced between 2.6.12-rc1 and 2.6.12-rc2. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13) - #include <net/sock.h> ---- vmnet-only/skblin.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/skblin.c.new 2010-02-05 23:45:17.276123591 +0100 -@@ -20,8 +20,12 @@ - * Detect whether skb_linearize takes one or two arguments. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17) - /* ---- vmnet-only/socket.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/socket.c.new 2010-02-05 23:45:30.149065913 +0100 -@@ -21,8 +21,12 @@ - * It got renamed from wmem_alloc sometime during 2.5.x. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <net/sock.h> ---- vmnet-only/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vmnet-only/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* ---- vsock-only/autoconf/cachecreate.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/cachecreate.c.new 2010-02-05 23:46:29.157369452 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * All kernels before 2.6.22 take 6 arguments. All kernels since ---- vsock-only/autoconf/epoll.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/epoll.c.new 2010-02-05 23:46:39.884406108 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vsock-only/autoconf/filldir1.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/filldir1.c.new 2010-02-05 23:46:52.692243523 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) - #include <linux/fs.h> ---- vsock-only/autoconf/geninclude.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/geninclude.c.new 2010-02-05 23:46:58.292953391 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vsock-only/autoconf/getsb1.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/getsb1.c.new 2010-02-05 23:47:07.516892747 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - ---- vsock-only/autoconf/setnice.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/setnice.c.new 2010-02-05 23:47:16.829514462 +0100 -@@ -20,8 +20,12 @@ - * set_user_nice appeared in 2.4.21. But some distros - * backported it to older kernels. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) - #include <linux/sched.h> ---- vsock-only/autoconf/sk_filter.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/sk_filter.c.new 2010-02-05 23:47:28.501825992 +0100 -@@ -23,8 +23,12 @@ - * This test will fail to build on kernels with the new interface. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * We'd restrict this test to 2.4.21 and earlier kernels, but Mandrake's ---- vsock-only/autoconf/statfs1.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/statfs1.c.new 2010-02-05 23:47:41.174472911 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - #include <linux/fs.h> ---- vsock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vsock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* diff --git a/app-emulation/vmware-modules/files/1.0.0.24-kernel-2.6.29.patch b/app-emulation/vmware-modules/files/1.0.0.24-kernel-2.6.29.patch deleted file mode 100644 index cd8aeb9eb247..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.24-kernel-2.6.29.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -ur vmware-modules-1.0.0.24.0/work/vmblock-only/Makefile.kernel vmware-modules-1.0.0.24/work/vmblock-only/Makefile.kernel ---- vmware-modules-1.0.0.24.0/work/vmblock-only/Makefile.kernel 2009-03-27 08:05:21.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vmblock-only/Makefile.kernel 2009-04-07 16:14:55.000000000 +0400 -@@ -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, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) -diff -ur vmware-modules-1.0.0.24.0/work/vmci-only/Makefile.kernel vmware-modules-1.0.0.24/work/vmci-only/Makefile.kernel ---- vmware-modules-1.0.0.24.0/work/vmci-only/Makefile.kernel 2009-03-27 08:05:22.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vmci-only/Makefile.kernel 2009-04-07 16:14:55.000000000 +0400 -@@ -21,7 +21,7 @@ - - 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 -ur vmware-modules-1.0.0.24.0/work/vmmon-only/linux/driver.c vmware-modules-1.0.0.24/work/vmmon-only/linux/driver.c ---- vmware-modules-1.0.0.24.0/work/vmmon-only/linux/driver.c 2009-03-27 08:05:19.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vmmon-only/linux/driver.c 2009-04-07 16:15:11.000000000 +0400 -@@ -1984,10 +1984,10 @@ - } - - case IOCTL_VMX86_ALLOW_CORE_DUMP: -- if (current->euid == current->uid && -- current->fsuid == current->uid && -- current->egid == current->gid && -- current->fsgid == current->gid) { -+ if (current_euid() == current_uid() && -+ current_fsuid() == current_uid() && -+ current_egid() == current_gid() && -+ current_fsgid() == current_gid()) { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) || defined(MMF_DUMPABLE) - /* Dump core, readable by user. */ - set_bit(MMF_DUMPABLE, ¤t->mm->flags); -diff -ur vmware-modules-1.0.0.24.0/work/vmmon-only/linux/hostif.c vmware-modules-1.0.0.24/work/vmmon-only/linux/hostif.c ---- vmware-modules-1.0.0.24.0/work/vmmon-only/linux/hostif.c 2009-03-27 08:05:18.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vmmon-only/linux/hostif.c 2009-04-07 16:19:05.000000000 +0400 -@@ -3424,6 +3424,82 @@ - } - - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+static inline -+void compat_cap_raise(int cap) -+{ -+ cap_raise(current->cap_effective, cap); -+} -+#else -+static -+void compat_cap_raise(int cap) -+{ -+ struct cred *new_cred; -+ -+ new_cred = prepare_creds(); -+ if (new_cred != NULL) -+ { -+ cap_raise(new_cred->cap_effective, cap); -+ commit_creds(new_cred); -+ } -+ else -+ { -+ Log("compat_cap_raise(%d) prepare_creds(): Out of memory\n", cap); -+ } -+} -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+static inline -+void compat_cap_lower(int cap) -+{ -+ cap_lower(current->cap_effective, cap); -+} -+#else -+static -+void compat_cap_lower(int cap) -+{ -+ struct cred *new_cred; -+ -+ new_cred = prepare_creds(); -+ if (new_cred != NULL) -+ { -+ cap_lower(new_cred->cap_effective, cap); -+ commit_creds(new_cred); -+ } -+ else -+ { -+ Log("compat_cap_lower(%d) prepare_creds(): Out of memory\n", cap); -+ } -+} -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+static inline -+void compat_set_fsuid(int fsuid) -+{ -+ current->fsuid = fsuid; -+} -+#else -+static -+void compat_set_fsuid(int fsuid) -+{ -+ struct cred *new_cred; -+ -+ new_cred = prepare_creds(); -+ if (new_cred != NULL) -+ { -+ new_cred->fsuid = fsuid; -+ commit_creds(new_cred); -+ } -+ else -+ { -+ Log("compat_set_fsuid(%d) prepare_creds(): Out of memory\n", fsuid); -+ } -+} -+#endif -+ -+ - /* - *---------------------------------------------------------------------- - * -@@ -3456,7 +3532,7 @@ - oldFS = get_fs(); - set_fs(KERNEL_DS); - compat_allow_signal(SIGKILL); -- cap_raise(current->cap_effective, CAP_SYS_RESOURCE); -+ compat_cap_raise(CAP_SYS_RESOURCE); - compat_set_user_nice(current, linuxState.fastClockPriority); - - while (linuxState.fastClockRate > HZ + HZ/16) { -@@ -3580,19 +3656,19 @@ - Bool cap; - long pid; - -- fsuid = current->fsuid; -- current->fsuid = 0; -+ fsuid = current_fsuid(); -+ compat_set_fsuid(0); - filp = filp_open("/dev/rtc", O_RDONLY, 0); -- current->fsuid = fsuid; -+ compat_set_fsuid(fsuid); - if (IS_ERR(filp)) { - Warning("/dev/rtc open failed: %d\n", (int)(VA)filp); - return -(int)(VA)filp; - } -- cap = cap_raised(current->cap_effective, CAP_SYS_RESOURCE); -- cap_raise(current->cap_effective, CAP_SYS_RESOURCE); -+ cap = cap_raised(current_cap(), CAP_SYS_RESOURCE); -+ compat_cap_raise(CAP_SYS_RESOURCE); - res = HostIFDoIoctl(filp, RTC_PIE_ON, 0); - if (!cap) { -- cap_lower(current->cap_effective, CAP_SYS_RESOURCE); -+ compat_cap_lower(CAP_SYS_RESOURCE); - } - if (res < 0) { - Warning("/dev/rtc enable interrupt failed: %d\n", res); -diff -ur vmware-modules-1.0.0.24.0/work/vmmon-only/Makefile.kernel vmware-modules-1.0.0.24/work/vmmon-only/Makefile.kernel ---- vmware-modules-1.0.0.24.0/work/vmmon-only/Makefile.kernel 2009-03-27 08:05:19.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vmmon-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 -@@ -22,7 +22,7 @@ - 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 -ur vmware-modules-1.0.0.24.0/work/vmnet-only/Makefile.kernel vmware-modules-1.0.0.24/work/vmnet-only/Makefile.kernel ---- vmware-modules-1.0.0.24.0/work/vmnet-only/Makefile.kernel 2009-03-27 08:05:20.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vmnet-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 -@@ -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)/socket.c, -DVMW_HAVE_SK_WMEM_ALLOC, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, ) -diff -ur vmware-modules-1.0.0.24.0/work/vmnet-only/netif.c vmware-modules-1.0.0.24/work/vmnet-only/netif.c ---- vmware-modules-1.0.0.24.0/work/vmnet-only/netif.c 2009-03-27 08:05:20.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vmnet-only/netif.c 2009-04-07 16:15:21.000000000 +0400 -@@ -55,6 +55,30 @@ - struct net_device_stats stats; - } VNetNetIF; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+/* -+ Prior to KERNEL_VERSION(2, 6, 29) "struct net_device" had "void -+ *priv" field which was used as pointer to "VNetNetIF". -+*/ -+ -+#define VNetNetIF_netdev_priv_size 0 -+ -+#define VNetNetIF_netdev_netIf(dev) (*(VNetNetIF**)&((dev)->priv)) -+ -+#else -+/* -+ Since KERNEL_VERSION(2, 6, 29) pointer to "VNetNetIF" is stored in -+ explicitly allocated private area. -+*/ -+typedef struct { -+ VNetNetIF *netIf; -+} VNetNetIF_netdev_priv; -+ -+#define VNetNetIF_netdev_priv_size sizeof(VNetNetIF_netdev_priv) -+ -+#define VNetNetIF_netdev_netIf(dev) (((VNetNetIF_netdev_priv *)compat_netdev_priv(dev))->netIf) -+ -+#endif - - static void VNetNetIfFree(VNetJack *this); - static void VNetNetIfReceive(VNetJack *this, struct sk_buff *skb); -@@ -318,13 +342,13 @@ - memcpy(netIf->devName, devName, sizeof netIf->devName); - NULL_TERMINATE_STRING(netIf->devName); - -- dev = compat_alloc_netdev(0, netIf->devName, VNetNetIfSetup); -+ dev = compat_alloc_netdev(VNetNetIF_netdev_priv_size, netIf->devName, VNetNetIfSetup); - if (!dev) { - retval = -ENOMEM; - goto out; - } - -- dev->priv = netIf; -+ VNetNetIF_netdev_netIf(dev) = netIf; - netIf->dev = dev; - - memcpy(dev->dev_addr, netIf->port.paddr, sizeof netIf->port.paddr); -@@ -566,7 +590,7 @@ - VNetNetifStartXmit(struct sk_buff *skb, // IN: - struct net_device *dev) // IN: - { -- VNetNetIF *netIf = (VNetNetIF*)dev->priv; -+ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); - - if(skb == NULL) { - return 0; -@@ -618,7 +642,7 @@ - VNetNetifSetMAC(struct net_device *dev, // IN: - void *p) // IN: - { -- VNetNetIF *netIf = (VNetNetIF*)dev->priv; -+ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); - struct sockaddr const *addr = p; - if (!VMX86_IS_STATIC_MAC(addr->sa_data)) { - return -EINVAL; -@@ -675,7 +699,7 @@ - struct net_device_stats * - VNetNetifGetStats(struct net_device *dev) // IN: - { -- VNetNetIF *netIf = (VNetNetIF*)dev->priv; -+ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); - return &(netIf->stats); - } - -diff -ur vmware-modules-1.0.0.24.0/work/vsock-only/linux/util.c vmware-modules-1.0.0.24/work/vsock-only/linux/util.c ---- vmware-modules-1.0.0.24.0/work/vsock-only/linux/util.c 2009-03-27 08:05:23.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vsock-only/linux/util.c 2009-04-07 16:15:21.000000000 +0400 -@@ -154,7 +154,7 @@ - goto error; - } - -- Log(buf); -+ Log("%s", buf); - - return; - -diff -ur vmware-modules-1.0.0.24.0/work/vsock-only/Makefile.kernel vmware-modules-1.0.0.24/work/vsock-only/Makefile.kernel ---- vmware-modules-1.0.0.24.0/work/vsock-only/Makefile.kernel 2009-03-27 08:05:23.000000000 +0300 -+++ vmware-modules-1.0.0.24/work/vsock-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 -@@ -25,7 +25,7 @@ - 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, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) - diff --git a/app-emulation/vmware-modules/files/1.0.0.24-kernel-2.6.30.patch b/app-emulation/vmware-modules/files/1.0.0.24-kernel-2.6.30.patch deleted file mode 100644 index 2c95e1c80ede..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.24-kernel-2.6.30.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN source-OLD/vmblock-only/linux/control.c source-NEW/vmblock-only/linux/control.c ---- source-OLD/vmblock-only/linux/control.c 2008-10-28 22:47:20.000000000 -0700 -+++ source-NEW/vmblock-only/linux/control.c 2009-05-07 12:25:33.000000000 -0700 -@@ -46,7 +46,9 @@ - - static struct proc_dir_entry *controlProcDirEntry; - struct file_operations ControlFileOps = { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) - .owner = THIS_MODULE, -+#endif - .write = ControlFileOpWrite, - .release = ControlFileOpRelease, - }; -@@ -156,7 +158,9 @@ - return -EINVAL; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) - controlProcDirEntry->owner = THIS_MODULE; -+#endif - - /* Create /proc/fs/vmblock/mountPoint */ - controlProcMountpoint = proc_mkdir(VMBLOCK_CONTROL_MOUNTPOINT, -@@ -168,7 +172,9 @@ - return -EINVAL; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) - controlProcMountpoint->owner = THIS_MODULE; -+#endif - - /* Create /proc/fs/vmblock/dev */ - controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME, diff --git a/app-emulation/vmware-modules/files/1.0.0.24-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.24-makefile-kernel-dir.patch deleted file mode 100644 index 8df4d8694e34..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.24-makefile-kernel-dir.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile -index 0a9ffd6..4aa09e8 100644 ---- a/vmblock-only/Makefile -+++ b/vmblock-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - 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 := @PRODUCT@ -diff --git a/vmci-only/Makefile b/vmci-only/Makefile -index 0a6c9c6..6cd0b6d 100644 ---- a/vmci-only/Makefile -+++ b/vmci-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - 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/vmmon-only/Makefile b/vmmon-only/Makefile -index d26e58c..f8a40f4 100644 ---- a/vmmon-only/Makefile -+++ b/vmmon-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - 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/vmnet-only/Makefile b/vmnet-only/Makefile -index 4cabc30..568271a 100644 ---- a/vmnet-only/Makefile -+++ b/vmnet-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - 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/vsock-only/Makefile b/vsock-only/Makefile -index a69bc22..8a74856 100644 ---- a/vsock-only/Makefile -+++ b/vsock-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - 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.24-sema.patch b/app-emulation/vmware-modules/files/1.0.0.24-sema.patch deleted file mode 100644 index f5b06f3ccc0a..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.24-sema.patch +++ /dev/null @@ -1,87 +0,0 @@ -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/files/1.0.0.24-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.24-sk_sleep.patch deleted file mode 100644 index cdf76b0d8983..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.24-sk_sleep.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- vsock-only/linux/af_vsock.c.orig 2009-03-27 01:34:32.000000000 -0400 -+++ vsock-only/linux/af_vsock.c 2010-08-04 14:12:13.000000000 -0400 -@@ -3149,7 +3149,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) { -@@ -3172,7 +3172,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) { -@@ -3184,7 +3184,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; -@@ -3391,7 +3391,7 @@ - - sk = sock->sk; - -- poll_wait(file, sk->compat_sk_sleep, wait); -+ poll_wait(file, compat_sk_sleep(sk), wait); - mask = 0; - - if (sk->compat_sk_err) { -@@ -3992,7 +3992,7 @@ - * Wait for room in the produce queue to enqueue our user's data. - */ - timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT); -- 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; -@@ -4031,7 +4031,7 @@ - goto outWait; - } - -- compat_cont_prepare_to_wait(sk->compat_sk_sleep, -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), - &wait, TASK_INTERRUPTIBLE); - } - -@@ -4114,7 +4114,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; -@@ -4337,7 +4337,7 @@ - timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); - copied = 0; - -- 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 = VMCIQueue_BufReady(vsk->consumeQ, - vsk->produceQ, -@@ -4380,7 +4380,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) { -@@ -4472,7 +4472,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/files/1.0.0.24-unlocked_ioctl.patch b/app-emulation/vmware-modules/files/1.0.0.24-unlocked_ioctl.patch deleted file mode 100644 index f6250dc2e72f..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.24-unlocked_ioctl.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/files/1.0.0.24-vmnet-2.6.31.patch b/app-emulation/vmware-modules/files/1.0.0.24-vmnet-2.6.31.patch deleted file mode 100644 index a15e8ec1907e..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.24-vmnet-2.6.31.patch +++ /dev/null @@ -1,477 +0,0 @@ -diff -uh vmnet-only.old/bridge.c vmnet-only/bridge.c ---- vmnet-only.old/bridge.c 2009-03-27 01:34:28.000000000 -0400 -+++ vmnet-only/bridge.c 2009-08-14 22:55:21.000000000 -0400 -@@ -645,9 +645,7 @@ - if (clone == NULL) { - dev_unlock_list(); - } else { -- struct sock *sk = bridge->sk; -- atomic_add(skb->truesize, &sk->sk_wmem_alloc); -- clone->sk = sk; -+ skb_set_owner_w(clone, bridge->sk); - clone->protocol = ((struct ethhdr *)skb->data)->h_proto; // XXX - if ((dev->flags & IFF_UP) != 0) { - dev_unlock_list(); -@@ -987,6 +985,7 @@ - retval = -ENOMEM; - goto out; - } -+ sock_init_data(NULL, bridge->sk); - SET_SK_DEAD(bridge->sk); - - bridge->wirelessAdapter = VNetBridgeIsDeviceWireless(bridge->dev); -diff -uh vmnet-only.old/compat_netdevice.h vmnet-only/compat_netdevice.h ---- vmnet-only.old/compat_netdevice.h 2009-03-27 01:34:28.000000000 -0400 -+++ vmnet-only/compat_netdevice.h 2009-08-14 22:55:21.000000000 -0400 -@@ -178,6 +178,23 @@ - # define compat_netdev_priv(netdev) netdev_priv(netdev) - #endif - -+/* -+ * All compat_* business is good but when we can we should just provide -+ * missing implementation to ease upstreaming task. -+ */ -+#ifndef HAVE_ALLOC_NETDEV -+#define alloc_netdev(sz, name, setup) compat_alloc_netdev(sz, name, setup) -+#define alloc_etherdev(sz) compat_alloc_etherdev(sz) -+#endif -+ -+#ifndef HAVE_FREE_NETDEV -+#define free_netdev(dev) kfree(dev) -+#endif -+ -+#ifndef HAVE_NETDEV_PRIV -+#define netdev_priv(dev) ((dev)->priv) -+#endif -+ - #if defined(NETDEV_TX_OK) - # define COMPAT_NETDEV_TX_OK NETDEV_TX_OK - # define COMPAT_NETDEV_TX_BUSY NETDEV_TX_BUSY -@@ -186,55 +203,56 @@ - # define COMPAT_NETDEV_TX_BUSY 1 - #endif - --#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,43)) -+#ifndef HAVE_NETIF_QUEUE - static inline void --compat_netif_start_queue(struct device *dev) -+netif_start_queue(struct device *dev) - { - clear_bit(0, &dev->tbusy); - } - - static inline void --compat_netif_stop_queue(struct device *dev) -+netif_stop_queue(struct device *dev) - { - set_bit(0, &dev->tbusy); - } - - static inline int --compat_netif_queue_stopped(struct device *dev) -+netif_queue_stopped(struct device *dev) - { - return test_bit(0, &dev->tbusy); - } - - static inline void --compat_netif_wake_queue(struct device *dev) -+netif_wake_queue(struct device *dev) - { - clear_bit(0, &dev->tbusy); - mark_bh(NET_BH); - } - - static inline int --compat_netif_running(struct device *dev) -+netif_running(struct device *dev) - { - return dev->start == 0; - } - - static inline int --compat_netif_carrier_ok(struct device *dev) -+netif_carrier_ok(struct device *dev) - { - return 1; - } - - static inline void --compat_netif_carrier_on(struct device *dev) -+netif_carrier_on(struct device *dev) - { - } - - static inline void --compat_netif_carrier_off(struct device *dev) -+netif_carrier_off(struct device *dev) - { - } -+#endif - --#else -+/* Keep compat_* defines for now */ - #define compat_netif_start_queue(dev) netif_start_queue(dev) - #define compat_netif_stop_queue(dev) netif_stop_queue(dev) - #define compat_netif_queue_stopped(dev) netif_queue_stopped(dev) -@@ -243,7 +261,6 @@ - #define compat_netif_carrier_ok(dev) netif_carrier_ok(dev) - #define compat_netif_carrier_on(dev) netif_carrier_on(dev) - #define compat_netif_carrier_off(dev) netif_carrier_off(dev) --#endif - - /* unregister_netdevice_notifier was not safe prior to 2.6.17 */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 17) && \ -diff -uh vmnet-only.old/compat_sched.h vmnet-only/compat_sched.h ---- vmnet-only.old/compat_sched.h 2009-03-27 01:34:28.000000000 -0400 -+++ vmnet-only/compat_sched.h 2009-08-14 22:55:21.000000000 -0400 -@@ -272,6 +272,20 @@ - #endif - - /* -+ * Around 2.6.27 kernel stopped sending signals to kernel -+ * threads being frozen, instead threads have to check -+ * freezing() or use wait_event_freezable(). Unfortunately -+ * wait_event_freezable() completely hides the fact that -+ * thread was frozen from calling code and sometimes we do -+ * want to know that. -+ */ -+#ifdef PF_FREEZER_NOSIG -+#define compat_wait_check_freezing() freezing(current) -+#else -+#define compat_wait_check_freezing() (0) -+#endif -+ -+/* - * Since 2.6.27-rc2 kill_proc() is gone... Replacement (GPL-only!) - * API is available since 2.6.19. Use them from 2.6.27-rc1 up. - */ -diff -uh vmnet-only.old/compat_sock.h vmnet-only/compat_sock.h ---- vmnet-only.old/compat_sock.h 2009-03-27 01:34:28.000000000 -0400 -+++ vmnet-only/compat_sock.h 2009-08-14 22:55:21.000000000 -0400 -@@ -22,21 +22,9 @@ - #include <linux/stddef.h> /* for NULL */ - #include <net/sock.h> - -- - /* - * Between 2.5.70 and 2.5.71 all sock members were renamed from XXX to sk_XXX. -- * -- * VMW_HAVE_SK_WMEM_ALLOC is defined in module Makefile if kernel's struct sock -- * has sk_wmem_alloc member. See vmnet's Makefile.kernel for details. -- * It also means that all modules including this file should do -- * -- * EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/socket.c, -DVMW_HAVE_SK_WMEM_ALLOC, ) -- * -- * in their Makefiles. - */ --#ifndef VMW_HAVE_SK_WMEM_ALLOC --# define sk_wmem_alloc wmem_alloc --#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 71) - # define compat_sk_backlog_rcv backlog_rcv -diff -uh vmnet-only.old/Makefile vmnet-only/Makefile ---- vmnet-only.old/Makefile 2009-09-13 07:39:55.000000000 -0400 -+++ vmnet-only/Makefile 2009-09-13 07:40:10.000000000 -0400 -@@ -106,9 +106,10 @@ - postbuild:: ; - - $(DRIVER_KO): prebuild -- make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules -- make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) postbuild -- -+ make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ -+ MODULEBUILDDIR=$(MODULEBUILDDIR) modules -+ make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ -+ MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild - else - - ifneq ($(VM_CCVER), $(VMCCVER)) -@@ -121,7 +122,7 @@ - endif - - vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ -- $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) \ -+ $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) $(LINUXINCLUDE) \ - $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \ - -DKBUILD_BASENAME=\"$(DRIVER)\" \ - -Werror -S -o /dev/null -xc $(1) \ -diff -uh vmnet-only.old/Makefile.kernel vmnet-only/Makefile.kernel ---- vmnet-only.old/Makefile.kernel 2009-09-13 07:39:55.000000000 -0400 -+++ vmnet-only/Makefile.kernel 2009-09-13 07:40:10.000000000 -0400 -@@ -21,7 +21,6 @@ - - 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)/socket.c, -DVMW_HAVE_SK_WMEM_ALLOC, ) - 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, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, ) -diff -uh vmnet-only.old/Makefile.normal vmnet-only/Makefile.normal ---- vmnet-only.old/Makefile.normal 2009-03-27 01:34:28.000000000 -0400 -+++ vmnet-only/Makefile.normal 2009-08-14 22:55:22.000000000 -0400 -@@ -47,7 +47,6 @@ - | sed -n -e 's!^APATH!-I$(HEADER_DIR)/asm!p') - - CC_OPTS += $(call vm_check_build, $(SRCROOT)/epoll.c, -DVMW_HAVE_EPOLL, ) --CC_OPTS += $(call vm_check_build, $(SRCROOT)/socket.c, -DVMW_HAVE_SK_WMEM_ALLOC, ) - CC_OPTS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, ) - CC_OPTS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) - CC_OPTS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, ) -diff -uh vmnet-only.old/netif.c vmnet-only/netif.c ---- vmnet-only.old/netif.c 2009-09-13 07:39:55.000000000 -0400 -+++ vmnet-only/netif.c 2009-08-14 22:55:21.000000000 -0400 -@@ -55,30 +55,6 @@ - struct net_device_stats stats; - } VNetNetIF; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) --/* -- Prior to KERNEL_VERSION(2, 6, 29) "struct net_device" had "void -- *priv" field which was used as pointer to "VNetNetIF". --*/ -- --#define VNetNetIF_netdev_priv_size 0 -- --#define VNetNetIF_netdev_netIf(dev) (*(VNetNetIF**)&((dev)->priv)) -- --#else --/* -- Since KERNEL_VERSION(2, 6, 29) pointer to "VNetNetIF" is stored in -- explicitly allocated private area. --*/ --typedef struct { -- VNetNetIF *netIf; --} VNetNetIF_netdev_priv; -- --#define VNetNetIF_netdev_priv_size sizeof(VNetNetIF_netdev_priv) -- --#define VNetNetIF_netdev_netIf(dev) (((VNetNetIF_netdev_priv *)compat_netdev_priv(dev))->netIf) -- --#endif - - static void VNetNetIfFree(VNetJack *this); - static void VNetNetIfReceive(VNetJack *this, struct sk_buff *skb); -@@ -100,73 +76,6 @@ - static int VNetNetIfProcRead(char *page, char **start, off_t off, - int count, int *eof, void *data); - --#ifndef KERNEL_2_3_43 --/* softnet API emulation */ -- -- --/* -- *---------------------------------------------------------------------- -- * -- * netif_stop_queue -- -- * -- * Stops queue processing. -- * -- * Results: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --static inline void --netif_stop_queue(struct net_device *dev) // IN: --{ -- dev->tbusy = 1; --} -- -- --/* -- *---------------------------------------------------------------------- -- * -- * netif_start_queue -- -- * -- * Enables queue processing. It does not try to start received -- * frames processing. -- * -- * Results: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --static inline void --netif_start_queue(struct net_device *dev) // IN: --{ -- dev->tbusy = 0; --} -- -- --/* -- *---------------------------------------------------------------------- -- * -- * netif_wake_queue -- -- * -- * Enables queue processing. It schedules receive queue processing. -- * -- * Results: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --static inline void --netif_wake_queue(struct net_device *dev) // IN: --{ -- dev->tbusy = 0; -- mark_bh(NET_BH); --} --#endif -- -- - #if 0 - #ifdef KERNEL_2_3_43 - /* -@@ -221,7 +130,29 @@ - static void - VNetNetIfSetup(struct net_device *dev) // IN: - { -+#ifdef HAVE_NET_DEVICE_OPS -+ static const struct net_device_ops vnetNetifOps = { -+ .ndo_init = VNetNetifProbe, -+ .ndo_open = VNetNetifOpen, -+ .ndo_start_xmit = VNetNetifStartXmit, -+ .ndo_stop = VNetNetifClose, -+ .ndo_get_stats = VNetNetifGetStats, -+ .ndo_set_mac_address = VNetNetifSetMAC, -+ .ndo_set_multicast_list = VNetNetifSetMulticast, -+ /* -+ * We cannot stuck... If someone will report problems under -+ * low memory conditions or some such, we should enable it. -+ */ -+#if 0 -+ .ndo_tx_timeout = VNetNetifTxTimeout, -+#endif -+ }; -+#endif /* HAVE_NET_DEVICE_OPS */ -+ - ether_setup(dev); // turns on IFF_BROADCAST, IFF_MULTICAST -+#ifdef HAVE_NET_DEVICE_OPS -+ dev->netdev_ops = &vnetNetifOps; -+#else - dev->init = VNetNetifProbe; - dev->open = VNetNetifOpen; - dev->hard_start_xmit = VNetNetifStartXmit; -@@ -236,9 +167,43 @@ - */ - #if 0 - dev->tx_timeout = VNetNetifTxTimeout; -+#endif -+#endif -+#endif /* HAVE_NET_DEVICE_OPS */ -+ -+#if 0 -+ /* Only necessary if tx_timeout is set. See above. */ - dev->watchdog_timeo = TX_TIMEOUT; - #endif --#endif -+} -+ -+ -+/* -+ *---------------------------------------------------------------------- -+ * -+ * VNetNetIfNetDeviceToNetIf -- -+ * -+ * Converts net_device to netIf. -+ * -+ * Results: -+ * Converted pointer. -+ * -+ * Side effects: -+ * None. -+ * -+ *---------------------------------------------------------------------- -+ */ -+ -+static INLINE VNetNetIF * -+VNetNetIfNetDeviceToNetIf(struct net_device *dev) -+{ -+#ifdef HAVE_NETDEV_PRIV -+ VNetNetIF** devPriv = netdev_priv(dev); -+ -+ return *devPriv; -+#else -+ return dev->priv; -+#endif - } - - -@@ -342,13 +307,21 @@ - memcpy(netIf->devName, devName, sizeof netIf->devName); - NULL_TERMINATE_STRING(netIf->devName); - -- dev = compat_alloc_netdev(VNetNetIF_netdev_priv_size, netIf->devName, VNetNetIfSetup); -+#ifdef HAVE_NETDEV_PRIV -+ dev = compat_alloc_netdev(sizeof(VNetNetIF *), netIf->devName, VNetNetIfSetup); - if (!dev) { - retval = -ENOMEM; - goto out; - } -- -- VNetNetIF_netdev_netIf(dev) = netIf; -+ *(VNetNetIF**)netdev_priv(dev) = netIf; -+#else -+ dev = compat_alloc_netdev(0, netIf->devName, VNetNetIfSetup); -+ if (!dev) { -+ retval = -ENOMEM; -+ goto out; -+ } -+ dev->priv = netIf; -+#endif - netIf->dev = dev; - - memcpy(dev->dev_addr, netIf->port.paddr, sizeof netIf->port.paddr); -@@ -590,12 +563,14 @@ - VNetNetifStartXmit(struct sk_buff *skb, // IN: - struct net_device *dev) // IN: - { -- VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); -+ VNetNetIF *netIf; - - if(skb == NULL) { - return 0; - } - -+ netIf = VNetNetIfNetDeviceToNetIf(dev); -+ - /* - * Block a timer-based transmit from overlapping. This could better be - * done with atomic_swap(1, dev->tbusy), but set_bit() works as well. -@@ -642,11 +617,13 @@ - VNetNetifSetMAC(struct net_device *dev, // IN: - void *p) // IN: - { -- VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); -+ VNetNetIF *netIf; - struct sockaddr const *addr = p; -+ - if (!VMX86_IS_STATIC_MAC(addr->sa_data)) { - return -EINVAL; - } -+ netIf = VNetNetIfNetDeviceToNetIf(dev); - memcpy(netIf->port.paddr, addr->sa_data, dev->addr_len); - memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); - return 0; -@@ -696,11 +673,12 @@ - *---------------------------------------------------------------------- - */ - --struct net_device_stats * -+static struct net_device_stats * - VNetNetifGetStats(struct net_device *dev) // IN: - { -- VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); -- return &(netIf->stats); -+ VNetNetIF *netIf = VNetNetIfNetDeviceToNetIf(dev); -+ -+ return &netIf->stats; - } - - -Only in vmnet-only.old: socket.c 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 deleted file mode 100644 index 31dabc2325df..000000000000 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r3.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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.2 2011/03/16 17:36:57 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 ge 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 -} |