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