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