Gentoo Archives: gentoo-commits

From: "Mike Auty (ikelos)" <ikelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-player/files/2.5.1.126130: vmware-player-extras.py.patch vmware-player.py.patch
Date: Wed, 31 Dec 2008 02:06:05
Message-Id: E1LHqTB-0005dS-UJ@stork.gentoo.org
1 ikelos 08/12/31 02:06:01
2
3 Added: vmware-player-extras.py.patch
4 vmware-player.py.patch
5 Log:
6 Version bump vmware-player to 2.5.1.
7 (Portage version: 2.2_rc20/cvs/Linux 2.6.28 i686)
8
9 Revision Changes Path
10 1.1 app-emulation/vmware-player/files/2.5.1.126130/vmware-player-extras.py.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.5.1.126130/vmware-player-extras.py.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.5.1.126130/vmware-player-extras.py.patch?rev=1.1&content-type=text/plain
14
15 Index: vmware-player-extras.py.patch
16 ===================================================================
17 diff --git a/vmware-player-extras.py b/vmware-player-extras.py
18 index 21595b1..e8adf08 100644
19 --- a/vmware-player-extras.py
20 +++ b/vmware-player-extras.py
21 @@ -6,7 +6,8 @@ VMware Player Extras component installer.
22
23 DEST = LIBDIR/'vmware'
24 SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
25 -CONF = DEST/'setup/vmware-config'
26 +import os
27 +CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
28
29
30 class PlayerExtras(Installer):
31
32
33
34 1.1 app-emulation/vmware-player/files/2.5.1.126130/vmware-player.py.patch
35
36 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.5.1.126130/vmware-player.py.patch?rev=1.1&view=markup
37 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-player/files/2.5.1.126130/vmware-player.py.patch?rev=1.1&content-type=text/plain
38
39 Index: vmware-player.py.patch
40 ===================================================================
41 diff --git a/vmware-player.py b/vmware-player.py
42 index bee22df..d06cca9 100644
43 --- a/vmware-player.py
44 +++ b/vmware-player.py
45 @@ -6,7 +6,8 @@ VMware Player component installer.
46
47 GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
48 DEST = LIBDIR/'vmware'
49 -CONFIG = DEST/'setup/vmware-config'
50 +import os
51 +CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
52 CUPSLIBDIR = LIBDIR/'cups'
53 # XXX: LIBDIR should be properly calculated, to make this cleaner
54 if (PREFIX/'lib64/cups').exists():
55 @@ -84,12 +85,12 @@ class Player(Installer):
56 ret, kvers = output('uname', '-r')
57 kvers = kvers.strip()
58 modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
59 - base = path('/lib/modules/%s/misc' % kvers)
60 + base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
61
62 for module in modules:
63 for ext in ('o', 'ko'):
64 mod = '%s.%s' % (module, ext)
65 - (base/mod).remove(ignore_errors=True)
66 + # (base/mod).remove(ignore_errors=True)
67
68 def PreUninstall(self, old, new, upgrade):
69 script = INITSCRIPTDIR/'vmware'
70 @@ -156,8 +157,8 @@ class Player(Installer):
71 def PostTransactionInstall(self, old, new, upgrade):
72 if ENV.get('VMWARE_SKIP_MODULES'):
73 log.info('Skipping kernel module installation')
74 - elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
75 - log.info('Successfully installed kernel modules')
76 + # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
77 + # log.info('Successfully installed kernel modules')
78 else:
79 log.info('Unable to install kernel modules')
80
81 @@ -189,8 +190,8 @@ class Player(Installer):
82 for handler in ('vm', 'vms'):
83 for gconfType, key, value in settings:
84 key = key % handler
85 - run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
86 - '--type', gconfType, '--set', key, value)
87 + # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
88 + # '--type', gconfType, '--set', key, value)
89
90 # Instruct all gconfd daemons to reload.
91 run('killall', '-HUP', 'gconfd-2')
92 @@ -200,9 +201,9 @@ class Player(Installer):
93 def _deconfigureVMStreamingHandlers(self):
94 """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
95 def deconfigureGConf():
96 - for handler in ('vm', 'vms'):
97 - run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
98 - '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
99 + # for handler in ('vm', 'vms'):
100 + # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
101 + # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
102
103 # Instruct all gconfd daemons to reload.
104 run('killall', '-HUP', 'gconfd-2')