diff options
| author | Jonathan Bauer | 2013-05-10 18:58:13 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-05-10 18:58:13 +0200 |
| commit | c435ba694701a6cf28a724069f37ca44d4d305bf (patch) | |
| tree | 280df91b4211c318e3043a24a2a35f2814fe6b88 /remote/modules/vmplayer | |
| parent | schöne funktion :) (diff) | |
| parent | Add Server install script (diff) | |
| download | tm-scripts-c435ba694701a6cf28a724069f37ca44d4d305bf.tar.gz tm-scripts-c435ba694701a6cf28a724069f37ca44d4d305bf.tar.xz tm-scripts-c435ba694701a6cf28a724069f37ca44d4d305bf.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmplayer')
| -rwxr-xr-x | remote/modules/vmplayer/data/bin/vmplayer | 6 | ||||
| -rw-r--r-- | remote/modules/vmplayer/vmplayer.build | 13 | ||||
| -rw-r--r-- | remote/modules/vmplayer/vmplayer.conf | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/remote/modules/vmplayer/data/bin/vmplayer b/remote/modules/vmplayer/data/bin/vmplayer index d4cd1d65..874c3d96 100755 --- a/remote/modules/vmplayer/data/bin/vmplayer +++ b/remote/modules/vmplayer/data/bin/vmplayer @@ -1,8 +1,10 @@ #!/bin/sh for mod in /lib/modules/vmware/*.ko; do - insmod "$mod" || xmessage "Could not load kernel module $mod. vmplayer might fail." + insmod "$mod" && continue + xmessage "Could not load kernel module $mod. vmplayer might fail." done -/bin/vmplayer-bin $@ +export LIBCONF_DIR=/usr/lib/vmware/libconf +/usr/lib/vmware/bin/vmplayer $@ diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index e228292d..2d44381f 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -24,8 +24,19 @@ build() { cp -r ./src/vmware-usbarbitrator/bin "$MODULE_BUILD_DIR/usr/" || perror "Could not copy bin from vmware-usbarbitrator." cp -r ./src/vmware-vmx/{bin,etc,sbin} "$MODULE_BUILD_DIR/usr/" || perror "could not copy bin,etc,sbin to usr for vmare-vmx." cp -r ./src/vmware-vmx/lib/{bin,icu,lib,libconf,scripts} "$TARGET" || perror "Could not copy many things from vmware-vmx." - ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader." + [ ! -L "$TARGET/bin/vmplayer" ] && { ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."; } chmod +x "$TARGET"/bin/* + pinfo "Patching LIBCONF_DIR" + local file="" + for file in $(grep -rl "@@LIBCONF_DIR@@" "$MODULE_BUILD_DIR"); do + sed -i 's#@@LIBCONF_DIR@@#/usr/lib/vmware/libconf#g' "$file" + done + # Extract libgconf-2 stuff + COPYLIST="list_dpkg_output" + [ -e "${COPYLIST}" ] && rm "${COPYLIST}" + + list_packet_files >> "${COPYLIST}" + tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}" # Compile kernel modules pinfo "Compiling required kernel modules." # build modules diff --git a/remote/modules/vmplayer/vmplayer.conf b/remote/modules/vmplayer/vmplayer.conf index c5d92140..df88968e 100644 --- a/remote/modules/vmplayer/vmplayer.conf +++ b/remote/modules/vmplayer/vmplayer.conf @@ -1,3 +1,5 @@ +#REQUIRED_DEPENDENCIES="libgconf-2-4 fontconfig-config" +#REQUIRED_PACKAGES="libgconf-2-4 fontconfig-config" REQUIRED_BINARIES="" REQUIRED_SYSTEM_FILES="" REQUIRED_DIRECTORIES="/etc /usr" |