# 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.83 2011/12/03 20:04:15 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.84 2011/12/05 16:06:08 vadimk Exp $
+
+ 05 Dec 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+ -files/1.0.0.25-autoconf-generated.patch,
+ -files/1.0.0.25-makefile-include.patch,
+ -files/1.0.0.25-makefile-kernel-dir.patch, -files/1.0.0.25-sema.patch,
+ -vmware-modules-1.0.0.25-r3.ebuild, -files/1.0.0.25-sk_sleep.patch,
+ -vmware-modules-1.0.0.25-r4.ebuild, -files/1.0.0.25-unlocked_ioctl.patch,
+ -files/sched_h-2.6.32.patch, -files/apic.patch:
+ removed old version. bug 385727.
*vmware-modules-264.1 (03 Dec 2011)
+++ /dev/null
---- 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/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"
-
- /*
+++ /dev/null
-diff -urN old/vmblock-only/Makefile.kernel work/vmblock-only/Makefile.kernel
---- old/vmblock-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
-+++ work/vmblock-only/Makefile.kernel 2009-08-21 16:11:34.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 -urN old/vmci-only/Makefile.kernel work/vmci-only/Makefile.kernel
---- old/vmci-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
-+++ work/vmci-only/Makefile.kernel 2009-08-21 16:11:47.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 -urN old/vmmon-only/Makefile.kernel work/vmmon-only/Makefile.kernel
---- old/vmmon-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
-+++ work/vmmon-only/Makefile.kernel 2009-08-21 16:12:48.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 -urN old/vmnet-only/Makefile.kernel work/vmnet-only/Makefile.kernel
---- old/vmnet-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
-+++ work/vmnet-only/Makefile.kernel 2009-08-21 16:13:02.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)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
-diff -urN old/vsock-only/linux/util.c work/vsock-only/linux/util.c
---- old/vsock-only/linux/util.c 2009-08-21 16:10:32.000000000 -0400
-+++ work/vsock-only/linux/util.c 2009-08-21 16:13:27.000000000 -0400
-@@ -154,7 +154,7 @@
- goto error;
- }
-
-- Log(buf);
-+ Log("%s", buf);
-
- return;
-
-diff -urN old/vsock-only/Makefile.kernel work/vsock-only/Makefile.kernel
---- old/vsock-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400
-+++ work/vsock-only/Makefile.kernel 2009-08-21 16:13:41.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, )
-
+++ /dev/null
-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
+++ /dev/null
-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__ */
+++ /dev/null
---- vsock-only/linux/af_vsock.c.orig 2010-08-04 14:07:01.000000000 -0400
-+++ vsock-only/linux/af_vsock.c 2010-08-04 14:07:42.000000000 -0400
-@@ -3188,7 +3188,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) {
-@@ -3211,7 +3211,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) {
-@@ -3223,7 +3223,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;
-@@ -3430,7 +3430,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) {
-@@ -4041,7 +4041,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;
-@@ -4080,7 +4080,7 @@
- goto outWait;
- }
-
-- compat_cont_prepare_to_wait(sk->compat_sk_sleep,
-+ compat_cont_prepare_to_wait(compat_sk_sleep(sk),
- &wait, TASK_INTERRUPTIBLE);
- }
-
-@@ -4163,7 +4163,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;
-@@ -4386,7 +4386,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,
-@@ -4429,7 +4429,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) {
-@@ -4521,7 +4521,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;
+++ /dev/null
-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;
- }
-
+++ /dev/null
---- vmmon-only/linux/hostif.c.orig 2009-11-16 13:24:00.000000000 +0200
-+++ vmmon-only/linux/hostif.c 2009-11-16 13:08:56.000000000 +0200
-@@ -78,6 +78,8 @@
- #include "vmmonInt.h"
- #include "versioned_atomic.h"
-
-+#include <asm/apic.h>
-+
- #define UPTIME_FREQ CONST64(1000000)
-
- static struct {
-
+++ /dev/null
-diff -ur vmci-only.before/linux/vmciKernelIf.c vmci-only/linux/vmciKernelIf.c
---- vmci-only.before/linux/vmciKernelIf.c 2010-01-02 14:56:31.000000000 -0500
-+++ vmci-only/linux/vmciKernelIf.c 2010-01-02 14:57:01.000000000 -0500
-@@ -36,6 +36,7 @@
- #include "compat_module.h"
-
- #include "compat_version.h"
-+#include "compat_sched.h"
- #include "compat_wait.h"
- #include "compat_interrupt.h"
- #include "compat_spinlock.h"
-diff -ur vmnet-only.before/vnetUserListener.c vmnet-only/vnetUserListener.c
---- vmnet-only.before/vnetUserListener.c 2010-01-02 14:56:38.000000000 -0500
-+++ vmnet-only/vnetUserListener.c 2010-01-02 14:58:29.000000000 -0500
-@@ -32,6 +32,7 @@
- #include <linux/netdevice.h>
- #include <linux/poll.h>
- #include "compat_skbuff.h"
-+#include "compat_sched.h"
- #include "compat_wait.h"
- #include "vnetInt.h"
-
+++ /dev/null
-# 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.25-r3.ebuild,v 1.4 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}-makefile-include.patch"
- epatch "${FILESDIR}/sched_h-2.6.32.patch"
- 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 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
-}
+++ /dev/null
-# 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.25-r4.ebuild,v 1.2 2011/03/18 15:53:13 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic linux-info 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() {
- if kernel_is ge 2 6 37; then
- CONFIG_CHECK="BKL"
- linux-info_pkg_setup
- fi
-
- 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}-makefile-include.patch"
- epatch "${FILESDIR}/sched_h-2.6.32.patch"
- 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 36 && epatch "${FILESDIR}/${PV}-unlocked_ioctl.patch"
- kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV}-sema.patch"
-
- sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' {vmmon,vsock,vmblock,vmnet,vmci}-only/Makefile\
- || die "Sed failed."
-}
-
-src_install() {
- linux-mod_src_install
- local udevrules="${T}/60-vmware.rules"
- cat > "${udevrules}" <<-EOF
- KERNEL=="vmci", GROUP="vmware", MODE=660
- KERNEL=="vmmon", GROUP="vmware", MODE=660
- KERNEL=="vsock", GROUP="vmware", MODE=660
- EOF
- insinto /etc/udev/rules.d/
- doins "${udevrules}"
-}
# ChangeLog for app-emulation/vmware-player
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.99 2011/12/03 20:07:45 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.100 2011/12/05 16:04:20 vadimk Exp $
+
+ 05 Dec 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+ -vmware-player-2.5.5.328052.ebuild,
+ -files/2.5.5.328052/vmware-player.py.patch,
+ -files/2.5.5.328052/vmware-player-extras.py.patch,
+ -files/vmware-player-2.5.5.328052-installer.patch,
+ -files/vmware-player-2.5.rc, -files/helpers/module_patcher.sh,
+ -files/helpers/unbundler.sh, -files/helpers/vmware-config.sh:
+ removed old version. bug 385727.
*vmware-player-4.0.1.528992-r1 (03 Dec 2011)
+++ /dev/null
-diff --git a/vmware-player-extras.py b/vmware-player-extras.py
-index 21595b1..e8adf08 100644
---- a/vmware-player-extras.py
-+++ b/vmware-player-extras.py
-@@ -6,7 +6,8 @@ VMware Player Extras component installer.
-
- DEST = LIBDIR/'vmware'
- SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
--CONF = DEST/'setup/vmware-config'
-+import os
-+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
-
-
- class PlayerExtras(Installer):
+++ /dev/null
-diff --git a/vmware-player.py b/vmware-player.py
-index bee22df..d06cca9 100644
---- a/vmware-player.py
-+++ b/vmware-player.py
-@@ -6,7 +6,8 @@ VMware Player component installer.
-
- GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
- DEST = LIBDIR/'vmware'
--CONFIG = DEST/'setup/vmware-config'
-+import os
-+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
- CUPSLIBDIR = LIBDIR/'cups'
- # XXX: LIBDIR should be properly calculated, to make this cleaner
- if (PREFIX/'lib64/cups').exists():
-@@ -84,12 +85,12 @@ class Player(Installer):
- ret, kvers = output('uname', '-r')
- kvers = kvers.strip()
- modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
-- base = path('/lib/modules/%s/misc' % kvers)
-+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
-
- for module in modules:
- for ext in ('o', 'ko'):
- mod = '%s.%s' % (module, ext)
-- (base/mod).remove(ignore_errors=True)
-+ # (base/mod).remove(ignore_errors=True)
-
- def PreUninstall(self, old, new, upgrade):
- script = INITSCRIPTDIR/'vmware'
-@@ -156,8 +157,8 @@ class Player(Installer):
- def PostTransactionInstall(self, old, new, upgrade):
- if ENV.get('VMWARE_SKIP_MODULES'):
- log.info('Skipping kernel module installation')
-- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
-- log.info('Successfully installed kernel modules')
-+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
-+ # log.info('Successfully installed kernel modules')
- else:
- log.info('Unable to install kernel modules')
-
-@@ -189,8 +190,8 @@ class Player(Installer):
- for handler in ('vm', 'vms'):
- for gconfType, key, value in settings:
- key = key % handler
-- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-- '--type', gconfType, '--set', key, value)
-+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-+ # '--type', gconfType, '--set', key, value)
-
- # Instruct all gconfd daemons to reload.
- run('killall', '-HUP', 'gconfd-2')
-@@ -200,9 +201,9 @@ class Player(Installer):
- def _deconfigureVMStreamingHandlers(self):
- """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
- def deconfigureGConf():
-- for handler in ('vm', 'vms'):
-- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
-+ # for handler in ('vm', 'vms'):
-+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
-
- # Instruct all gconfd daemons to reload.
- run('killall', '-HUP', 'gconfd-2')
+++ /dev/null
-#!/bin/bash
-
-MY_BASE=$(basename $1)
-if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ];
-then
- echo -n "Module Patcher: "
- patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch
-fi
+++ /dev/null
-#!/bin/bash
-
-ORIGFILE="$1"
-
-is_relative() {
- local path="$1"
- shift
-
- [ "${path:0:1}" != "/" ]
- return
-}
-
-set_offsets() {
- # This won't work with non-GNU stat.
- FILE_SIZE=`stat -L --format "%s" "$1"`
- local offset=$(($FILE_SIZE - 4))
-
- MAGIC_OFFSET=$offset
- offset=$(($offset - 4))
-
- CHECKSUM_OFFSET=$offset
- offset=$(($offset - 4))
-
- VERSION_OFFSET=$offset
- offset=$(($offset - 4))
-
- PREPAYLOAD_OFFSET=$offset
- offset=$(($offset - 4))
-
- PREPAYLOAD_SIZE_OFFSET=$offset
- offset=$(($offset - 4))
-
- LAUNCHER_SIZE_OFFSET=$offset
- offset=$(($offset - 4))
-
- PAYLOAD_OFFSET=$offset
- offset=$(($offset - 4))
-
- PAYLOAD_SIZE_OFFSET=$offset
- offset=$(($offset - 4))
-}
-
-set_lengths() {
- local file="$1"
- if [ ! -s "$file" ]; then
- echo "$file does not exist"
- exit 1
- fi
-
- # XXX: put extraction in its own function
- MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '`
-
- if [ "$MAGIC_NUMBER" != "907380241" ]; then
- echo "magic number does not match"
- exit 1
- fi
-
- LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '`
- PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
- PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
-
- SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE))
-
- return 0
-}
-
-if is_relative "${ORIGFILE}"; then
- ORIGFILE="`pwd`/${ORIGFILE}"
-fi
-
-
-set_offsets ${ORIGFILE}
-set_lengths ${ORIGFILE}
-
-echo "Unbundling" ${ORIGFILE}
-
-PREPAYLOAD="prepayload"
-PAYLOAD="payload"
-
-# Unpack the pre-payload file
-mkdir ${PREPAYLOAD}
-cd ${PREPAYLOAD}
-dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null
-cd ..
-
-# Unpack the main file
-mkdir ${PAYLOAD}
-cd ${PAYLOAD}
-dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null
-cd ..
-
+++ /dev/null
-#!/bin/bash
-
-CONFIG_FILE="${D}/etc/vmware/config"
-
-remove_key() {
- local key=${1}
- grep -v "^${key} =" ${CONFIG_FILE}
- grep -v "^${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp
- mv ${CONFIG_FILE}.tmp ${CONFIG_FILE}
-}
-
-add_key() {
- local key=${1}
- local value=${2}
- echo "${1} = \"${2}\"" >> ${CONFIG_FILE}
-}
-
-mkdir -p $(dirname ${CONFIG_FILE})
-touch ${CONFIG_FILE}
-
-if [ "${1}" == "-s" ]; then
- remove_key ${2}
- add_key ${2} ${3/${D}/}
-fi
-
-if [ "${1}" == "-d" ]; then
- remove_key ${2}
-fi
-
+++ /dev/null
-diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
-index 7a46312..e1dbff1 100644
---- a/payload/install/vmware-installer/vmis/__init__.py
-+++ b/payload/install/vmware-installer/vmis/__init__.py
-@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
- VERSION = '.'.join([str(x) for x in VERSION_INFO])
- MAJOR_VERSION = VERSION_INFO[0]
-
--CONFDIR = path(u'/etc/vmware')
-+CONFDIR = path(u'./vmware-confdir')
- DATABASE_PATH = CONFDIR/'database'
-diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
-index e7abc2e..81c4a2b 100644
---- a/payload/install/vmware-installer/vmis/core/env.py
-+++ b/payload/install/vmware-installer/vmis/core/env.py
-@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
- # Python will interrept as being a module separator
- moduleName = component.name.replace('.', '')
- fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
-+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
-+ fileObj = file(pathName)
-
- try:
- # XXX: db.config cannot be set at the module level because this
-diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
-index 2be10de..f92ecff 100644
---- a/payload/install/vmware-installer/vmis/core/questions.py
-+++ b/payload/install/vmware-installer/vmis/core/questions.py
-@@ -139,6 +139,9 @@ class InitDir(Directory):
- """
- super(InitDir, self).Validate(answer)
-
-+ ### GENTOO PATCH ### Finish early
-+ return True
-+
- rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
- answer = path(answer)
-
-diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
-index 525df75..abb81b3 100644
---- a/payload/install/vmware-installer/vmis/ui/console.py
-+++ b/payload/install/vmware-installer/vmis/ui/console.py
-@@ -148,7 +148,7 @@ class Wizard(object):
- wrapper = TextWrapper()
- wrapper.width = 79
- wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
-- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
-+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
- except IOError: # RHEL4 appears to close stdin while we still expect it to be open
- pass
-
-diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
-index 4f609c4..b07b89d 100644
---- a/payload/install/vmware-installer/vmis/util/log.py
-+++ b/payload/install/vmware-installer/vmis/util/log.py
-@@ -22,6 +22,8 @@ else:
- # running a build)
- LOG_FILE = '/tmp/vmware-installer.log'
-
-+LOG_FILE = './vmware-installer.log'
-+
- if level <= logging.DEBUG:
- MAX_BYTES = 0
- BACKUP_COUNT = 0
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/files/vmware-player-2.5.rc,v 1.1 2008/11/09 20:23:55 ikelos Exp $
-
-depend() {
- need localmount
- use logger net hald
- after samba
-}
-
-vmware_prettify() {
- # Yea, the code is ugly but the output is pretty
- state=$1
- waserror=0
- msgtype=0
- while read line
- do
- [ "${line}" = "" ] && continue
- if [ ${msgtype} -le 0 ]
- then
- if [ ${msgtype} -eq -1 ]
- then
- ewarn ${line}
- continue
- fi
- case ${line} in
- *:*)
- einfon ${line}
- echo
- eend 0
- msgtype=1;;
- *)
- ewarn ${line}
- msgtype=-1
- waserror=1;;
- esac
- continue
- fi
-
- # Strip out anything after the <esc> code
- message=`echo ${line} | sed -e "s/^\(.*\)\e.*$/\1/"`
- einfon " ${message}"
- echo
-
- echo ${line} | grep -q done
- status=$?
- eend ${status}
-
- if [ ${status} -eq 0 ]
- then
- logger -p local0.err -t vmware-${state} "${line}"
- waserror=${status}
- fi
- done
- if [ "${msgtype}" = "-1" ]
- then
- eend 1 "VMware is not properly configured! See above."
- fi
- return ${waserror}
-}
-
-start() {
- test -x /etc/vmware/init.d/vmware || \
- eend 1 "vmware init script not found. Aborting" || return 1
-
- /etc/vmware/init.d/vmware start | vmware_prettify start
- return $?
-}
-
-stop() {
- /etc/vmware/init.d/vmware stop | vmware_prettify stop
- return $?
-}
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.5.328052.ebuild,v 1.4 2011/11/22 18:00:27 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
-SRC_URI="
- x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle )
- amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
- "
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="strip binchecks"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
- dev-python/lxml"
-RDEPEND="
- ~app-emulation/vmware-modules-1.0.0.25
- dev-cpp/cairomm
- dev-cpp/libgnomecanvasmm
- dev-cpp/libsexymm
- dev-libs/libxml2
- sys-libs/glibc
- sys-apps/pciutils
- >=x11-libs/libview-0.6.2
- x11-libs/libXcursor
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXtst
- !app-emulation/vmware-workstation
- "
-
-S=${WORKDIR}/vmware-distrib
-VM_INSTALL_DIR="/opt/vmware/player"
-
-pkg_setup() {
- if use x86; then
- MY_P="${MY_PN}.i386"
- elif use amd64; then
- MY_P="${MY_PN}.x86_64"
- fi
-
- if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
- die "Please emerge this package using a different terminal (e.g. not within screen)."
- fi
-}
-
-pkg_nofetch() {
- if use x86; then
- MY_P="${MY_PN}.i386"
- elif use amd64; then
- MY_P="${MY_PN}.x86_64"
- fi
-
- einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
-}
-
-src_unpack() {
- # Unbundle the bundle
- cp "${FILESDIR}"/helpers/* "${WORKDIR}"
- chmod a+x "${WORKDIR}"/*.sh
- "${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
-}
-
-src_prepare() {
- # Patch up the installer
- epatch "${FILESDIR}/${P}-installer.patch"
-
- mkdir "${WORKDIR}/vmware-confdir"
-}
-
-src_install() {
- dodir /etc/init.d
-
- #Run the installer
- local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
- local PYOPTS="-W ignore::DeprecationWarning"
- export VMWARE_SKIP_NETWORKING="true"
- python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
- --set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
- --set-setting initdir "${T}" \
- --set-setting initscriptdir "${D}/etc/init.d" \
- --set-setting prefix "${D}${VM_INSTALL_DIR}" \
- --set-setting sysconfdir "${D}/etc" \
- --install-component "${INSTALLER}" \
- --install-bundle "${DISTDIR}/${MY_P}.bundle" \
- --console --required
-
- rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
-
- if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
- eerror "VMware installation seems to have rolled back."
- eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
- eerror "in any bug reports you file."
- die "VMware installation rolled back."
- fi
-
- # Redirect all the ${D} paths to / paths"
- sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
-
- # Fix up icons/mime/desktop handlers
- dodir /usr/share/
- mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
- rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
- mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
- dodir /usr/share/mime
- mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
- sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
-
- # Bug 311435
- mv "${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2 \
- "${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2.old
- dosym /usr/lib/libxml2.so.2 "${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2
-
- # Copy across the temporary /etc/vmware directory
- dodir /etc/vmware/init.d
- cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
- mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
- sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
- newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
- touch "${D}"/etc/vmware/networking
-
- # Setup the path environment
- insinto /etc/env.d
- doins "${FILESDIR}/90${PN}"
-
- # Fix some paths to allow included gtk to work
- for i in "/etc/pango/pangorc" \
- "/etc/pango/pango.modules" \
- "/etc/gtk-2.0/gtk.immodules" \
- "/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
- sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
- sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
- done
-}
-
-pkg_config() {
- ${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-
- ewarn "Before you can use vmware-player, you must configure a default network setup."
- ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
- einfo "Stopping ${product_name} for safe unmerge"
- /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
# ChangeLog for app-emulation/vmware-workstation
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.229 2011/12/04 13:30:14 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.230 2011/12/05 16:05:04 vadimk Exp $
+
+ 05 Dec 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+ -files/vmware-workstation-6.5.5.328052-installer.patch,
+ -files/vmware-workstation-6.5.rc, -files/6.5.5.328052/vmware-player.py.patch,
+ -files/6.5.5.328052/vmware-player-extras.py.patch,
+ -files/6.5.5.328052/vmware-vix.py.patch,
+ -files/6.5.5.328052/vmware-workstation.py.patch,
+ -vmware-workstation-6.5.5.328052.ebuild, -files/helpers/module_patcher.sh,
+ -files/helpers/unbundler.sh, -files/helpers/vmware-config.sh,
+ -files/vmware-workstation.rc:
+ removed old version. bug 385727.
*vmware-workstation-8.0.1.528992-r1 (04 Dec 2011)
+++ /dev/null
-diff --git a/vmware-player-extras.py b/vmware-player-extras.py
-index 21595b1..e8adf08 100644
---- a/vmware-player-extras.py
-+++ b/vmware-player-extras.py
-@@ -6,7 +6,8 @@ VMware Player Extras component installer.
-
- DEST = LIBDIR/'vmware'
- SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
--CONF = DEST/'setup/vmware-config'
-+import os
-+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
-
-
- class PlayerExtras(Installer):
+++ /dev/null
-diff --git a/vmware-player.py b/vmware-player.py
-index bee22df..d06cca9 100644
---- a/vmware-player.py
-+++ b/vmware-player.py
-@@ -6,7 +6,8 @@ VMware Player component installer.
-
- GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
- DEST = LIBDIR/'vmware'
--CONFIG = DEST/'setup/vmware-config'
-+import os
-+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
- CUPSLIBDIR = LIBDIR/'cups'
- # XXX: LIBDIR should be properly calculated, to make this cleaner
- if (PREFIX/'lib64/cups').exists():
-@@ -84,12 +85,12 @@ class Player(Installer):
- ret, kvers = output('uname', '-r')
- kvers = kvers.strip()
- modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
-- base = path('/lib/modules/%s/misc' % kvers)
-+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
-
- for module in modules:
- for ext in ('o', 'ko'):
- mod = '%s.%s' % (module, ext)
-- (base/mod).remove(ignore_errors=True)
-+ # (base/mod).remove(ignore_errors=True)
-
- def PreUninstall(self, old, new, upgrade):
- script = INITSCRIPTDIR/'vmware'
-@@ -156,8 +157,8 @@ class Player(Installer):
- def PostTransactionInstall(self, old, new, upgrade):
- if ENV.get('VMWARE_SKIP_MODULES'):
- log.info('Skipping kernel module installation')
-- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
-- log.info('Successfully installed kernel modules')
-+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
-+ # log.info('Successfully installed kernel modules')
- else:
- log.info('Unable to install kernel modules')
-
-@@ -189,8 +190,8 @@ class Player(Installer):
- for handler in ('vm', 'vms'):
- for gconfType, key, value in settings:
- key = key % handler
-- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-- '--type', gconfType, '--set', key, value)
-+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-+ # '--type', gconfType, '--set', key, value)
-
- # Instruct all gconfd daemons to reload.
- run('killall', '-HUP', 'gconfd-2')
-@@ -200,9 +201,9 @@ class Player(Installer):
- def _deconfigureVMStreamingHandlers(self):
- """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
- def deconfigureGConf():
-- for handler in ('vm', 'vms'):
-- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
-+ # for handler in ('vm', 'vms'):
-+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
-
- # Instruct all gconfd daemons to reload.
- run('killall', '-HUP', 'gconfd-2')
+++ /dev/null
-diff --git a/vmware-vix.py b/vmware-vix.py
-index ac64dc5..8fdc2b2 100644
---- a/vmware-vix.py
-+++ b/vmware-vix.py
-@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc. All rights reserved. -- VMware Confidential
- VIX component installer.
- """
- DEST = LIBDIR/'vmware-vix'
--conf = DEST/'setup/vmware-config'
-+import os
-+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
-
- class VIX(Installer):
- def InitializeInstall(self, old, new, upgrade):
+++ /dev/null
-diff --git a/vmware-workstation.py b/vmware-workstation.py
-index 55476d9..8dd4c0a 100644
---- a/vmware-workstation.py
-+++ b/vmware-workstation.py
-@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc. All rights reserved. -- VMware Confidential
- VMware Workstation component installer.
- """
- DEST = LIBDIR/'vmware'
--conf = DEST/'setup/vmware-config'
-+import os
-+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
-
- class Workstation(Installer):
- def PreTransactionInstall(self, old, new, upgrade):
-@@ -40,7 +41,7 @@ class Workstation(Installer):
- self.AddPermission(DEST/'bin/*', BINARY)
-
- eclipse = config.Get('vmware-workstation.eclipse')
-- eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
-+ False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
- Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
-
- def _vmwareMountRunnable(self, vmwareMount):
+++ /dev/null
-#!/bin/bash
-
-MY_BASE=$(basename $1)
-if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ];
-then
- echo -n "Module Patcher: "
- patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch
-fi
+++ /dev/null
-#!/bin/bash
-
-ORIGFILE="$1"
-
-is_relative() {
- local path="$1"
- shift
-
- [ "${path:0:1}" != "/" ]
- return
-}
-
-set_offsets() {
- # This won't work with non-GNU stat.
- FILE_SIZE=`stat -L --format "%s" "$1"`
- local offset=$(($FILE_SIZE - 4))
-
- MAGIC_OFFSET=$offset
- offset=$(($offset - 4))
-
- CHECKSUM_OFFSET=$offset
- offset=$(($offset - 4))
-
- VERSION_OFFSET=$offset
- offset=$(($offset - 4))
-
- PREPAYLOAD_OFFSET=$offset
- offset=$(($offset - 4))
-
- PREPAYLOAD_SIZE_OFFSET=$offset
- offset=$(($offset - 4))
-
- LAUNCHER_SIZE_OFFSET=$offset
- offset=$(($offset - 4))
-
- PAYLOAD_OFFSET=$offset
- offset=$(($offset - 4))
-
- PAYLOAD_SIZE_OFFSET=$offset
- offset=$(($offset - 4))
-}
-
-set_lengths() {
- local file="$1"
- if [ ! -s "$file" ]; then
- echo "$file does not exist"
- exit 1
- fi
-
- # XXX: put extraction in its own function
- MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '`
-
- if [ "$MAGIC_NUMBER" != "907380241" ]; then
- echo "magic number does not match"
- exit 1
- fi
-
- LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '`
- PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
- PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
-
- SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE))
-
- return 0
-}
-
-if is_relative "${ORIGFILE}"; then
- ORIGFILE="`pwd`/${ORIGFILE}"
-fi
-
-
-set_offsets ${ORIGFILE}
-set_lengths ${ORIGFILE}
-
-echo "Unbundling" ${ORIGFILE}
-
-PREPAYLOAD="prepayload"
-PAYLOAD="payload"
-
-# Unpack the pre-payload file
-mkdir ${PREPAYLOAD}
-cd ${PREPAYLOAD}
-dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null
-cd ..
-
-# Unpack the main file
-mkdir ${PAYLOAD}
-cd ${PAYLOAD}
-dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null
-cd ..
-
+++ /dev/null
-#!/bin/bash
-
-CONFIG_FILE="${D}/etc/vmware/config"
-
-remove_key() {
- local key=${1}
- grep -v "^${key} =" ${CONFIG_FILE}
- grep -v "^${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp
- mv ${CONFIG_FILE}.tmp ${CONFIG_FILE}
-}
-
-add_key() {
- local key=${1}
- local value=${2}
- echo "${1} = \"${2}\"" >> ${CONFIG_FILE}
-}
-
-mkdir -p $(dirname ${CONFIG_FILE})
-touch ${CONFIG_FILE}
-
-if [ "${1}" == "-s" ]; then
- remove_key ${2}
- add_key ${2} ${3/${D}/}
-fi
-
-if [ "${1}" == "-d" ]; then
- remove_key ${2}
-fi
-
+++ /dev/null
-diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
-index 7a46312..e1dbff1 100644
---- a/payload/install/vmware-installer/vmis/__init__.py
-+++ b/payload/install/vmware-installer/vmis/__init__.py
-@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
- VERSION = '.'.join([str(x) for x in VERSION_INFO])
- MAJOR_VERSION = VERSION_INFO[0]
-
--CONFDIR = path(u'/etc/vmware')
-+CONFDIR = path(u'./vmware-confdir')
- DATABASE_PATH = CONFDIR/'database'
-diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
-index e7abc2e..81c4a2b 100644
---- a/payload/install/vmware-installer/vmis/core/env.py
-+++ b/payload/install/vmware-installer/vmis/core/env.py
-@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
- # Python will interrept as being a module separator
- moduleName = component.name.replace('.', '')
- fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
-+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
-+ fileObj = file(pathName)
-
- try:
- # XXX: db.config cannot be set at the module level because this
-diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
-index 2be10de..f92ecff 100644
---- a/payload/install/vmware-installer/vmis/core/questions.py
-+++ b/payload/install/vmware-installer/vmis/core/questions.py
-@@ -139,6 +139,9 @@ class InitDir(Directory):
- """
- super(InitDir, self).Validate(answer)
-
-+ ### GENTOO PATCH ### Finish early
-+ return True
-+
- rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
- answer = path(answer)
-
-diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
-index 525df75..abb81b3 100644
---- a/payload/install/vmware-installer/vmis/ui/console.py
-+++ b/payload/install/vmware-installer/vmis/ui/console.py
-@@ -148,7 +148,7 @@ class Wizard(object):
- wrapper = TextWrapper()
- wrapper.width = 79
- wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
-- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
-+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
- except IOError: # RHEL4 appears to close stdin while we still expect it to be open
- pass
-
-diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
-index 4f609c4..b07b89d 100644
---- a/payload/install/vmware-installer/vmis/util/log.py
-+++ b/payload/install/vmware-installer/vmis/util/log.py
-@@ -22,6 +22,8 @@ else:
- # running a build)
- LOG_FILE = '/tmp/vmware-installer.log'
-
-+LOG_FILE = './vmware-installer.log'
-+
- if level <= logging.DEBUG:
- MAX_BYTES = 0
- BACKUP_COUNT = 0
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation-6.5.rc,v 1.1 2008/11/09 20:56:55 ikelos Exp $
-
-depend() {
- need localmount
- use logger net hald
- after samba
-}
-
-vmware_prettify() {
- # Yea, the code is ugly but the output is pretty
- state=$1
- waserror=0
- msgtype=0
- while read line
- do
- [ "${line}" = "" ] && continue
- if [ ${msgtype} -le 0 ]
- then
- if [ ${msgtype} -eq -1 ]
- then
- ewarn ${line}
- continue
- fi
- case ${line} in
- *:*)
- einfon ${line}
- echo
- eend 0
- msgtype=1;;
- *)
- ewarn ${line}
- msgtype=-1
- waserror=1;;
- esac
- continue
- fi
-
- # Strip out anything after the <esc> code
- message=`echo ${line} | sed -e "s/^\(.*\)\e.*$/\1/"`
- einfon " ${message}"
- echo
-
- echo ${line} | grep -q done
- status=$?
- eend ${status}
-
- if [ ${status} -eq 0 ]
- then
- logger -p local0.err -t vmware-${state} "${line}"
- waserror=${status}
- fi
- done
- if [ "${msgtype}" = "-1" ]
- then
- eend 1 "VMware is not properly configured! See above."
- fi
- return ${waserror}
-}
-
-start() {
- test -x /etc/vmware/init.d/vmware || \
- eend 1 "vmware init script not found. Aborting" || return 1
-
- /etc/vmware/init.d/vmware start | vmware_prettify start
- return $?
-}
-
-stop() {
- /etc/vmware/init.d/vmware stop | vmware_prettify stop
- return $?
-}
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation.rc,v 1.6 2007/11/25 12:50:32 ikelos Exp $
-
-depend() {
- need localmount
- use logger net hald
- after samba
-}
-
-vmware_prettify() {
- # Yea, the code is ugly but the output is pretty
- state=$1
- waserror=0
- msgtype=0
- while read line
- do
- [ "${line}" = "" ] && continue
- if [ ${msgtype} -le 0 ]
- then
- if [ ${msgtype} -eq -1 ]
- then
- ewarn ${line}
- continue
- fi
- case ${line} in
- *:*)
- einfon ${line}
- echo
- eend 0
- msgtype=1;;
- *)
- ewarn ${line}
- msgtype=-1
- waserror=1;;
- esac
- continue
- fi
-
- # Strip out anything after the <esc> code
- message=`echo ${line} | sed -e "s/^\(.*\)\e.*$/\1/"`
- einfon " ${message}"
- echo
-
- echo ${line} | grep -q done
- status=$?
- eend ${status}
-
- if [ ${status} -eq 0 ]
- then
- logger -p local0.err -t vmware-${state} "${line}"
- waserror=${status}
- fi
- done
- if [ "${msgtype}" = "-1" ]
- then
- eend 1 "VMware is not properly configured! See above."
- fi
- return ${waserror}
-}
-
-start() {
- test -x /etc/vmware/init.d/vmware || \
- eend 1 "vmware init script not found. Aborting" || return 1
-
- if modinfo vmblock > /dev/null 2>&1;
- then
- ebegin "Loading vmblock for drag and drop support"
- local result
- modprobe vmblock || eend 1 "Failed to load vmblock driver"
- test ! -e /tmp/VMwareDnD && mkdir /tmp/VMwareDnD
- chmod 1777 /tmp/VMwareDnD
- mount -t vmblock none /proc/fs/vmblock/mountPoint || eend 1 "Failed to mount the vmblock filesystem"
- eend 0
- fi
-
- /etc/vmware/init.d/vmware start | vmware_prettify start
- return $?
-}
-
-stop() {
- umount /proc/fs/vmblock/mountPoint > /dev/null 2>&1
- /etc/vmware/init.d/vmware stop | vmware_prettify stop
- return $?
-}
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.5.5.328052.ebuild,v 1.5 2011/12/03 20:14:02 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-Workstation-$(replace_version_separator 3 - $PV)"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
-DOWNLOAD_URL="http://www.vmware.com/download/ws/"
-SRC_URI="
- x86? ( ${MY_PN}.i386.bundle )
- amd64? ( ${MY_PN}.x86_64.bundle )
- "
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="strip fetch binchecks"
-PROPERTIES="interactive"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
- dev-python/lxml"
-RDEPEND="
- ~app-emulation/vmware-modules-1.0.0.25
- dev-cpp/cairomm
- dev-cpp/libgnomecanvasmm
- dev-cpp/libsexymm
- sys-apps/pciutils
- sys-fs/fuse
- sys-libs/glibc
- >=x11-libs/libview-0.6.2
- x11-libs/libgksu
- x11-libs/libXcursor
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXtst
- !!app-emulation/vmware-player
- "
-
-S=${WORKDIR}/vmware-distrib
-VM_INSTALL_DIR="/opt/vmware/workstation"
-
-pkg_setup() {
- if use x86; then
- MY_P="${MY_PN}.i386"
- elif use amd64; then
- MY_P="${MY_PN}.x86_64"
- fi
-
- if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
- die "Please emerge this package using a different terminal (e.g. not within screen)."
- fi
-}
-
-pkg_nofetch() {
- if use x86; then
- MY_P="${MY_PN}.i386"
- elif use amd64; then
- MY_P="${MY_PN}.x86_64"
- fi
-
- einfo "Please download the ${MY_P}.bundle from"
- einfo "${DOWNLOAD_URL}"
- einfo "and place it in ${DISTDIR}"
-}
-
-src_unpack() {
- # Unbundle the bundle
- cp "${FILESDIR}"/helpers/* "${WORKDIR}"
- chmod a+x "${WORKDIR}"/*.sh
- "${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
-}
-
-src_prepare() {
- # Patch up the installer
- epatch "${FILESDIR}/${P}-installer.patch"
-
- mkdir "${WORKDIR}/vmware-confdir"
-}
-
-src_install() {
- dodir /etc/init.d
-
- #Run the installer
- local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
- local PYOPTS="-W ignore::DeprecationWarning"
- export VMWARE_SKIP_NETWORKING="true"
- python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
- --set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
- --set-setting initdir "${T}" \
- --set-setting initscriptdir "${D}/etc/init.d" \
- --set-setting prefix "${D}${VM_INSTALL_DIR}" \
- --set-setting sysconfdir "${D}/etc" \
- --install-component "${INSTALLER}" \
- --install-bundle "${DISTDIR}/${MY_P}.bundle" \
- --console --required
-
- rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
-
- if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
- eerror "VMware installation seems to have rolled back."
- eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
- eerror "in any bug reports you file."
- die "VMware installation rolled back."
- fi
-
- # Redirect all the ${D} paths to / paths"
- sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
-
- # Fix up icons/mime/desktop handlers
- dodir /usr/share/
- mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
- rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
- mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
- dodir /usr/share/mime
- mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
- sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
-
- # Copy across the temporary /etc/vmware directory
- dodir /etc/vmware/init.d
- cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
- mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
- sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
- newinitd "${FILESDIR}/${PN}"-6.5.rc vmware
- touch "${D}"/etc/vmware/networking
-
- # Setup the path environment
- insinto /etc/env.d
- doins "${FILESDIR}/90${PN}"
-
- # Fix some paths to allow included gtk to work
- for i in "/etc/pango/pangorc" \
- "/etc/pango/pango.modules" \
- "/etc/gtk-2.0/gtk.immodules" \
- "/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
- sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
- sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
- done
-}
-
-pkg_config() {
- ${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-
- ewarn "Before you can use vmware-workstation, you must configure a default network setup."
- ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
- einfo "Stopping ${product_name} for safe unmerge"
- /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
projects / gentoo.git / commitdiff