dbp/virtualization
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app-emulation/vmware-workstation: use my modules

Browse Source 
(Portage version: 2.2.0_alpha10-r1/svn/Linux x86_64, RepoMan options: --force)

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@2798 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2011-01-04 13:21:44 +00:00
parent c2263de5fd
commit 7e5435b123
17 changed files with 592 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player-extras.py.patch Normal file
View File

@@ -0,0 +1,14 @@
diff --git a/vmware-player-extras.py b/vmware-player-extras.py
index 21595b1..e8adf08 100644
--- a/vmware-player-extras.py
+++ b/vmware-player-extras.py
@@ -6,7 +6,8 @@ VMware Player Extras component installer.
DEST = LIBDIR/'vmware'
SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
-CONF = DEST/'setup/vmware-config'
+import os
+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
class PlayerExtras(Installer):

64
app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player.py.patch Normal file
View File

@@ -0,0 +1,64 @@
diff --git a/vmware-player.py b/vmware-player.py
index bee22df..d06cca9 100644
--- a/vmware-player.py
+++ b/vmware-player.py
@@ -6,7 +6,8 @@ VMware Player component installer.
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'
# XXX: LIBDIR should be properly calculated, to make this cleaner
if (PREFIX/'lib64/cups').exists():
@@ -84,12 +85,12 @@ class Player(Installer):
ret, kvers = output('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)
def PreUninstall(self, old, new, upgrade):
script = INITSCRIPTDIR/'vmware'
@@ -156,8 +157,8 @@ class Player(Installer):
def PostTransactionInstall(self, old, new, upgrade):
if ENV.get('VMWARE_SKIP_MODULES'):
log.info('Skipping kernel module installation')
- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
- log.info('Successfully installed kernel modules')
+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
+ # log.info('Successfully installed kernel modules')
else:
log.info('Unable to install kernel modules')
@@ -189,8 +190,8 @@ class Player(Installer):
for handler in ('vm', 'vms'):
for gconfType, key, value in settings:
key = key % handler
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
- '--type', gconfType, '--set', key, value)
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+ # '--type', gconfType, '--set', key, value)
# Instruct all gconfd daemons to reload.
run('killall', '-HUP', 'gconfd-2')
@@ -200,9 +201,9 @@ class Player(Installer):
def _deconfigureVMStreamingHandlers(self):
""" Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
def deconfigureGConf():
- for handler in ('vm', 'vms'):
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ # for handler in ('vm', 'vms'):
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
# Instruct all gconfd daemons to reload.
run('killall', '-HUP', 'gconfd-2')

14
app-emulation/vmware-workstation/files/6.5.4.246459/vmware-vix.py.patch Normal file
View File

@@ -0,0 +1,14 @@
diff --git a/vmware-vix.py b/vmware-vix.py
index ac64dc5..8fdc2b2 100644
--- a/vmware-vix.py
+++ b/vmware-vix.py
@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc. All rights reserved. -- VMware Confidential
VIX component installer.
"""
DEST = LIBDIR/'vmware-vix'
-conf = DEST/'setup/vmware-config'
+import os
+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
class VIX(Installer):
def InitializeInstall(self, old, new, upgrade):

23
app-emulation/vmware-workstation/files/6.5.4.246459/vmware-workstation.py.patch Normal file
View File

@@ -0,0 +1,23 @@
diff --git a/vmware-workstation.py b/vmware-workstation.py
index 55476d9..8dd4c0a 100644
--- a/vmware-workstation.py
+++ b/vmware-workstation.py
@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc. All rights reserved. -- VMware Confidential
VMware Workstation component installer.
"""
DEST = LIBDIR/'vmware'
-conf = DEST/'setup/vmware-config'
+import os
+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
class Workstation(Installer):
def PreTransactionInstall(self, old, new, upgrade):
@@ -40,7 +41,7 @@ class Workstation(Installer):
self.AddPermission(DEST/'bin/*', BINARY)
eclipse = config.Get('vmware-workstation.eclipse')
- eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
+ False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
def _vmwareMountRunnable(self, vmwareMount):

14
app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player-extras.py.patch Normal file
View File

@@ -0,0 +1,14 @@
diff --git a/vmware-player-extras.py b/vmware-player-extras.py
index 21595b1..e8adf08 100644
--- a/vmware-player-extras.py
+++ b/vmware-player-extras.py
@@ -6,7 +6,8 @@ VMware Player Extras component installer.
DEST = LIBDIR/'vmware'
SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
-CONF = DEST/'setup/vmware-config'
+import os
+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
class PlayerExtras(Installer):

64
app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player.py.patch Normal file
View File

@@ -0,0 +1,64 @@
diff --git a/vmware-player.py b/vmware-player.py
index bee22df..d06cca9 100644
--- a/vmware-player.py
+++ b/vmware-player.py
@@ -6,7 +6,8 @@ VMware Player component installer.
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'
# XXX: LIBDIR should be properly calculated, to make this cleaner
if (PREFIX/'lib64/cups').exists():
@@ -84,12 +85,12 @@ class Player(Installer):
ret, kvers = output('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)
def PreUninstall(self, old, new, upgrade):
script = INITSCRIPTDIR/'vmware'
@@ -156,8 +157,8 @@ class Player(Installer):
def PostTransactionInstall(self, old, new, upgrade):
if ENV.get('VMWARE_SKIP_MODULES'):
log.info('Skipping kernel module installation')
- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
- log.info('Successfully installed kernel modules')
+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
+ # log.info('Successfully installed kernel modules')
else:
log.info('Unable to install kernel modules')
@@ -189,8 +190,8 @@ class Player(Installer):
for handler in ('vm', 'vms'):
for gconfType, key, value in settings:
key = key % handler
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
- '--type', gconfType, '--set', key, value)
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+ # '--type', gconfType, '--set', key, value)
# Instruct all gconfd daemons to reload.
run('killall', '-HUP', 'gconfd-2')
@@ -200,9 +201,9 @@ class Player(Installer):
def _deconfigureVMStreamingHandlers(self):
""" Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
def deconfigureGConf():
- for handler in ('vm', 'vms'):
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ # for handler in ('vm', 'vms'):
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
# Instruct all gconfd daemons to reload.
run('killall', '-HUP', 'gconfd-2')

14
app-emulation/vmware-workstation/files/6.5.5.328052/vmware-vix.py.patch Normal file
View File

@@ -0,0 +1,14 @@
diff --git a/vmware-vix.py b/vmware-vix.py
index ac64dc5..8fdc2b2 100644
--- a/vmware-vix.py
+++ b/vmware-vix.py
@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc. All rights reserved. -- VMware Confidential
VIX component installer.
"""
DEST = LIBDIR/'vmware-vix'
-conf = DEST/'setup/vmware-config'
+import os
+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
class VIX(Installer):
def InitializeInstall(self, old, new, upgrade):

23
app-emulation/vmware-workstation/files/6.5.5.328052/vmware-workstation.py.patch Normal file
View File

@@ -0,0 +1,23 @@
diff --git a/vmware-workstation.py b/vmware-workstation.py
index 55476d9..8dd4c0a 100644
--- a/vmware-workstation.py
+++ b/vmware-workstation.py
@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc. All rights reserved. -- VMware Confidential
VMware Workstation component installer.
"""
DEST = LIBDIR/'vmware'
-conf = DEST/'setup/vmware-config'
+import os
+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
class Workstation(Installer):
def PreTransactionInstall(self, old, new, upgrade):
@@ -40,7 +41,7 @@ class Workstation(Installer):
self.AddPermission(DEST/'bin/*', BINARY)
eclipse = config.Get('vmware-workstation.eclipse')
- eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
+ False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
def _vmwareMountRunnable(self, vmwareMount):

64
app-emulation/vmware-workstation/files/vmware-workstation-6.5.4.246459-installer.patch Normal file
View File

@@ -0,0 +1,64 @@
diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
index 7a46312..e1dbff1 100644
--- a/payload/install/vmware-installer/vmis/__init__.py
+++ b/payload/install/vmware-installer/vmis/__init__.py
@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
VERSION = '.'.join([str(x) for x in VERSION_INFO])
MAJOR_VERSION = VERSION_INFO[0]
-CONFDIR = path(u'/etc/vmware')
+CONFDIR = path(u'./vmware-confdir')
DATABASE_PATH = CONFDIR/'database'
diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
index e7abc2e..81c4a2b 100644
--- a/payload/install/vmware-installer/vmis/core/env.py
+++ b/payload/install/vmware-installer/vmis/core/env.py
@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
# Python will interrept as being a module separator
moduleName = component.name.replace('.', '')
fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
+ fileObj = file(pathName)
try:
# XXX: db.config cannot be set at the module level because this
diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
index 2be10de..f92ecff 100644
--- a/payload/install/vmware-installer/vmis/core/questions.py
+++ b/payload/install/vmware-installer/vmis/core/questions.py
@@ -139,6 +139,9 @@ class InitDir(Directory):
"""
super(InitDir, self).Validate(answer)
+ ### GENTOO PATCH ### Finish early
+ return True
+
rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
answer = path(answer)
diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
index 525df75..abb81b3 100644
--- a/payload/install/vmware-installer/vmis/ui/console.py
+++ b/payload/install/vmware-installer/vmis/ui/console.py
@@ -148,7 +148,7 @@ class Wizard(object):
wrapper = TextWrapper()
wrapper.width = 79
wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
except IOError: # RHEL4 appears to close stdin while we still expect it to be open
pass
diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
index 4f609c4..b07b89d 100644
--- a/payload/install/vmware-installer/vmis/util/log.py
+++ b/payload/install/vmware-installer/vmis/util/log.py
@@ -22,6 +22,8 @@ else:
# running a build)
LOG_FILE = '/tmp/vmware-installer.log'
+LOG_FILE = './vmware-installer.log'
+
if level <= logging.DEBUG:
MAX_BYTES = 0
BACKUP_COUNT = 0

64
app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch Normal file
View File

@@ -0,0 +1,64 @@
diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
index 7a46312..e1dbff1 100644
--- a/payload/install/vmware-installer/vmis/__init__.py
+++ b/payload/install/vmware-installer/vmis/__init__.py
@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
VERSION = '.'.join([str(x) for x in VERSION_INFO])
MAJOR_VERSION = VERSION_INFO[0]
-CONFDIR = path(u'/etc/vmware')
+CONFDIR = path(u'./vmware-confdir')
DATABASE_PATH = CONFDIR/'database'
diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
index e7abc2e..81c4a2b 100644
--- a/payload/install/vmware-installer/vmis/core/env.py
+++ b/payload/install/vmware-installer/vmis/core/env.py
@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
# Python will interrept as being a module separator
moduleName = component.name.replace('.', '')
fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
+ fileObj = file(pathName)
try:
# XXX: db.config cannot be set at the module level because this
diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
index 2be10de..f92ecff 100644
--- a/payload/install/vmware-installer/vmis/core/questions.py
+++ b/payload/install/vmware-installer/vmis/core/questions.py
@@ -139,6 +139,9 @@ class InitDir(Directory):
"""
super(InitDir, self).Validate(answer)
+ ### GENTOO PATCH ### Finish early
+ return True
+
rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
answer = path(answer)
diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
index 525df75..abb81b3 100644
--- a/payload/install/vmware-installer/vmis/ui/console.py
+++ b/payload/install/vmware-installer/vmis/ui/console.py
@@ -148,7 +148,7 @@ class Wizard(object):
wrapper = TextWrapper()
wrapper.width = 79
wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
except IOError: # RHEL4 appears to close stdin while we still expect it to be open
pass
diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
index 4f609c4..b07b89d 100644
--- a/payload/install/vmware-installer/vmis/util/log.py
+++ b/payload/install/vmware-installer/vmis/util/log.py
@@ -22,6 +22,8 @@ else:
# running a build)
LOG_FILE = '/tmp/vmware-installer.log'
+LOG_FILE = './vmware-installer.log'
+
if level <= logging.DEBUG:
MAX_BYTES = 0
BACKUP_COUNT = 0