From 7a456f2d51ffbb9e77edfa24c65cf193cc439d70 Mon Sep 17 00:00:00 2001
From: root
Date: Fri, 31 May 2013 16:10:53 +0200
Subject: [vmplayer] More error checks [stage31] more error checks in stage31
 (and then drop to shell) [fileutil] Add option to tarcopy to ignore failed
 reads

---
 remote/modules/vmplayer/vmplayer.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
index 70143a7e..e2c830c0 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -87,6 +87,7 @@ build_modules() {
 	
 
 	[ -e "/etc/vmware/config" ] && cp "/etc/vmware/config" "/etc/vmware/config.mltk.bak"
+	mkdir -p "/etc/vmware" || perror "Could not create /etc/vmware"
 	cat > "/etc/vmware/config" << EOF
 .encoding = "UTF-8"
 installerDefaults.componentDownloadEnabled = "yes"
@@ -135,7 +136,9 @@ EOF
 	pinfo "KOMPALIERE VMWARE KERNEL MODULE"
 	for MOD in vsock vmblock vmmon vmnet vmci; do
 		pinfo "Kompaliere $MOD"
-		"$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" ] && 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"
 	done	
 
 	cd -
-- 
cgit v1.2.3-55-g7522


From 66020de2fed830e66bd5a8ebf873f8803941dc8e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 1 Jun 2013 20:17:16 +0200
Subject: [vmplayer] Fixed mounting of vmplayer NFS share

---
 remote/modules/vmplayer/vmplayer.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
index 70143a7e..fc18936e 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -1,10 +1,10 @@
 fetch_source() {
 	#mount vmware bundle directory
-	[ ! -d /mnt/store/vmware ] && mkdir -p /mnt/store/vmware
-	if [ "x$(ls /mnt/store/vmware)" == "x" ]; then
-		mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting."
+	[ ! -d /mnt/store ] && mkdir -p /mnt/store
+	if [ "x$(ls /mnt/store)" == "x" ]; then
+		mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store || perror "Could not mount vmware bundle directory. Exiting."
 	fi
-	ARCH=$(uname -m)
+	ARCH="$(uname -m)"
 	[ "$ARCH" = "i686" ] && ARCH=i386
 	local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)"
 	[ -z "$BUNDLE" ] && perror "Could not find vmplayer at /mnt/store for ARCH = $ARCH"
-- 
cgit v1.2.3-55-g7522