71 lines
3.2 KiB
Diff
71 lines
3.2 KiB
Diff
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
Date: 2009-12-25
|
|
Initial Package Version: 2.5.3
|
|
Origin: gentoo
|
|
Upstream Status: never accepted
|
|
Description: patch in the modified install sources
|
|
|
|
diff -Naur 3.0.0.orig/vmware-player-app.py 3.0.0/vmware-player-app.py
|
|
--- 3.0.0.orig/vmware-player-app.py 2009-12-25 10:31:40.605560643 +0000
|
|
+++ 3.0.0/vmware-player-app.py 2009-12-25 10:39:48.550559786 +0000
|
|
@@ -6,7 +6,8 @@
|
|
|
|
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'
|
|
SETTINGS = \
|
|
{ 'libdir': DEST,
|
|
@@ -166,12 +167,12 @@
|
|
ret, kvers, _ = self.RunCommand('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)
|
|
|
|
# Make sure we kill all processes that should not be running!
|
|
self._killVMwareProcesses()
|
|
@@ -329,8 +330,8 @@
|
|
def PostTransactionInstall(self, old, new, upgrade):
|
|
if ENV.get('VMWARE_SKIP_MODULES'):
|
|
log.Info('Skipping kernel module installation')
|
|
- elif self.RunCommand(BINDIR/'vmware-modconfig', '--console', '--install-all').retCode == 0:
|
|
- log.Info('Successfully installed kernel modules')
|
|
+ # elif self.RunCommand(BINDIR/'vmware-modconfig', '--console', '--install-all').retCode == 0:
|
|
+ # log.Info('Successfully installed kernel modules')
|
|
else:
|
|
log.Info('Unable to install kernel modules')
|
|
|
|
@@ -359,8 +360,8 @@
|
|
for handler in ('vm', 'vms'):
|
|
for gconfType, key, value in settings:
|
|
key = key % handler
|
|
- self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
|
- '--type', gconfType, '--set', key, value)
|
|
+ # self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
|
+ # '--type', gconfType, '--set', key, value)
|
|
|
|
# Instruct all gconfd daemons to reload.
|
|
self.RunCommand('killall', '-HUP', 'gconfd-2')
|
|
@@ -370,9 +371,9 @@
|
|
def _deconfigureVMStreamingHandlers(self):
|
|
""" Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
|
|
def deconfigureGConf():
|
|
- for handler in ('vm', 'vms'):
|
|
- self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
|
- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
|
|
+ # for handler in ('vm', 'vms'):
|
|
+ # self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
|
|
+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
|
|
|
|
# Instruct all gconfd daemons to reload.
|
|
self.RunCommand('killall', '-HUP', 'gconfd-2')
|