diff options
| author | Michael Neves | 2013-07-08 17:02:37 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-07-08 17:02:37 +0200 |
| commit | 12d3c2d4bc1a66eb33566fb32b0f25603836eea8 (patch) | |
| tree | 0179ffbd9e85dcd3954afa1720b1a699f33c4f31 /remote/modules/vmplayer | |
| parent | [vmchooser] remove unneeded icon for xterm (diff) | |
| parent | [debug] remove xset from REQUIRED_INSTALLED_PACKAGES as its wrong for ubuntu (diff) | |
| download | tm-scripts-12d3c2d4bc1a66eb33566fb32b0f25603836eea8.tar.gz tm-scripts-12d3c2d4bc1a66eb33566fb32b0f25603836eea8.tar.xz tm-scripts-12d3c2d4bc1a66eb33566fb32b0f25603836eea8.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmplayer')
| -rw-r--r-- | remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 1 | ||||
| -rw-r--r-- | remote/modules/vmplayer/vmplayer.build | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include index 9b0fea91..45ff2d72 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -351,7 +351,6 @@ esac local FORCE3D="" if [ -n "$SLX_VMWARE_3D" ]; then FORCE3D='mks.gl.allowBlacklistedDrivers = "TRUE"' - enable3d="TRUE" fi # serial/parallel port defined (e.g. "ttyS0, lp0" or "autodetect") diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index a4dd8a29..4c0d46e6 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -60,7 +60,7 @@ build() { post_copy() { # FIXME: gconftool is copied without dependencies - tarcopy "$(find /usr/lib/ -name gconv -type d)" "$TARGET_BUILD_DIR" + tarcopy "$(find /usr/lib/ /usr/lib64 -name gconv -type d)" "$TARGET_BUILD_DIR" #Update Icon cache for vmplayer gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || pwarning "update-icon-cache-3.0 failed." #fix vmware-usbarbotrator bug @@ -69,7 +69,6 @@ post_copy() { } build_modules() { - pdebug "PAtCHIGN" # need to be in src cd "$MODULE_DIR/src" || perror "Could not cd to '$MODULE_DIR/src'" local VMWARE_MODCONFIG="$MODULE_DIR/src/vmware-vmx/bin/vmware-modconfig" @@ -133,9 +132,9 @@ EOF tar cf "vmblock.tar" "vmblock-only/" || perror "repacking of vmblock.tar failed." cd - - pinfo "KOMPALIERE VMWARE KERNEL MODULE" + pinfo "KOMPILIERE VMWARE KERNEL MODULE" for MOD in vsock vmblock vmmon vmnet vmci; do - pinfo "Kompaliere $MOD" + pinfo "Kompiliere $MOD" [ -s "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko" ] && unlink "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko" "$VMWARE_MODCONFIG" --console --build-mod -k "$UTS_RELEASE" "$MOD" "$(which gcc)" "$MODULES_DIR/kernel/ksrc/include" "vmplayer" "$MOD" [ ! -s "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko" ] && perror "Error compiling via $VMWARE_MODCONFIG" |