Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Vadim Kuznetsov (vadimk)" <vadimk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-workstation/files/6.5.5.328052: vmware-player.py.patch vmware-player-extras.py.patch vmware-vix.py.patch vmware-workstation.py.patch
Date: Wed, 29 Dec 2010 20:08:57
Message-Id: 20101229200847.9CFBF20054@flycatcher.gentoo.org
1 vadimk 10/12/29 20:08:47
2
3 Added: vmware-player.py.patch
4 vmware-player-extras.py.patch vmware-vix.py.patch
5 vmware-workstation.py.patch
6 Log:
7 Version bump. Bugs 350073, 345377
8
9 (Portage version: 2.1.9.26/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player.py.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player.py.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player.py.patch?rev=1.1&content-type=text/plain
16
17 Index: vmware-player.py.patch
18 ===================================================================
19 diff --git a/vmware-player.py b/vmware-player.py
20 index bee22df..d06cca9 100644
21 --- a/vmware-player.py
22 +++ b/vmware-player.py
23 @@ -6,7 +6,8 @@ VMware Player component installer.
24
25 GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
26 DEST = LIBDIR/'vmware'
27 -CONFIG = DEST/'setup/vmware-config'
28 +import os
29 +CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
30 CUPSLIBDIR = LIBDIR/'cups'
31 # XXX: LIBDIR should be properly calculated, to make this cleaner
32 if (PREFIX/'lib64/cups').exists():
33 @@ -84,12 +85,12 @@ class Player(Installer):
34 ret, kvers = output('uname', '-r')
35 kvers = kvers.strip()
36 modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
37 - base = path('/lib/modules/%s/misc' % kvers)
38 + base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
39
40 for module in modules:
41 for ext in ('o', 'ko'):
42 mod = '%s.%s' % (module, ext)
43 - (base/mod).remove(ignore_errors=True)
44 + # (base/mod).remove(ignore_errors=True)
45
46 def PreUninstall(self, old, new, upgrade):
47 script = INITSCRIPTDIR/'vmware'
48 @@ -156,8 +157,8 @@ class Player(Installer):
49 def PostTransactionInstall(self, old, new, upgrade):
50 if ENV.get('VMWARE_SKIP_MODULES'):
51 log.info('Skipping kernel module installation')
52 - elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
53 - log.info('Successfully installed kernel modules')
54 + # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
55 + # log.info('Successfully installed kernel modules')
56 else:
57 log.info('Unable to install kernel modules')
58
59 @@ -189,8 +190,8 @@ class Player(Installer):
60 for handler in ('vm', 'vms'):
61 for gconfType, key, value in settings:
62 key = key % handler
63 - run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
64 - '--type', gconfType, '--set', key, value)
65 + # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
66 + # '--type', gconfType, '--set', key, value)
67
68 # Instruct all gconfd daemons to reload.
69 run('killall', '-HUP', 'gconfd-2')
70 @@ -200,9 +201,9 @@ class Player(Installer):
71 def _deconfigureVMStreamingHandlers(self):
72 """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
73 def deconfigureGConf():
74 - for handler in ('vm', 'vms'):
75 - run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
76 - '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
77 + # for handler in ('vm', 'vms'):
78 + # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
79 + # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
80
81 # Instruct all gconfd daemons to reload.
82 run('killall', '-HUP', 'gconfd-2')
83
84
85
86 1.1 app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player-extras.py.patch
87
88 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player-extras.py.patch?rev=1.1&view=markup
89 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player-extras.py.patch?rev=1.1&content-type=text/plain
90
91 Index: vmware-player-extras.py.patch
92 ===================================================================
93 diff --git a/vmware-player-extras.py b/vmware-player-extras.py
94 index 21595b1..e8adf08 100644
95 --- a/vmware-player-extras.py
96 +++ b/vmware-player-extras.py
97 @@ -6,7 +6,8 @@ VMware Player Extras component installer.
98
99 DEST = LIBDIR/'vmware'
100 SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
101 -CONF = DEST/'setup/vmware-config'
102 +import os
103 +CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
104
105
106 class PlayerExtras(Installer):
107
108
109
110 1.1 app-emulation/vmware-workstation/files/6.5.5.328052/vmware-vix.py.patch
111
112 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-vix.py.patch?rev=1.1&view=markup
113 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-vix.py.patch?rev=1.1&content-type=text/plain
114
115 Index: vmware-vix.py.patch
116 ===================================================================
117 diff --git a/vmware-vix.py b/vmware-vix.py
118 index ac64dc5..8fdc2b2 100644
119 --- a/vmware-vix.py
120 +++ b/vmware-vix.py
121 @@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc. All rights reserved. -- VMware Confidential
122 VIX component installer.
123 """
124 DEST = LIBDIR/'vmware-vix'
125 -conf = DEST/'setup/vmware-config'
126 +import os
127 +conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
128
129 class VIX(Installer):
130 def InitializeInstall(self, old, new, upgrade):
131
132
133
134 1.1 app-emulation/vmware-workstation/files/6.5.5.328052/vmware-workstation.py.patch
135
136 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-workstation.py.patch?rev=1.1&view=markup
137 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-workstation.py.patch?rev=1.1&content-type=text/plain
138
139 Index: vmware-workstation.py.patch
140 ===================================================================
141 diff --git a/vmware-workstation.py b/vmware-workstation.py
142 index 55476d9..8dd4c0a 100644
143 --- a/vmware-workstation.py
144 +++ b/vmware-workstation.py
145 @@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc. All rights reserved. -- VMware Confidential
146 VMware Workstation component installer.
147 """
148 DEST = LIBDIR/'vmware'
149 -conf = DEST/'setup/vmware-config'
150 +import os
151 +conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
152
153 class Workstation(Installer):
154 def PreTransactionInstall(self, old, new, upgrade):
155 @@ -40,7 +41,7 @@ class Workstation(Installer):
156 self.AddPermission(DEST/'bin/*', BINARY)
157
158 eclipse = config.Get('vmware-workstation.eclipse')
159 - eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
160 + False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
161 Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
162
163 def _vmwareMountRunnable(self, vmwareMount):
Report Message
Find on MARC Find on Google Groups