more updates to vmplayer (finally works)

2 files changed, 11 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 46e4da8f..45a77ae0 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -24,8 +24,14 @@ 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/*
+	# 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
 	return 0 # TODO: Fix kompalieren
 	pinfo "Compiling required kernel modules."