From 551e8f6a9a74b84aaca32c82ced678fe9b698ded Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 3 Feb 2014 16:07:48 +0100
Subject: [vmware] Fix /etc/vmware/config generation to include build/version,
 add usbarb.conf, some other minor fixes

---
 remote/modules/vmware/vmware.build | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'remote/modules/vmware/vmware.build')

diff --git a/remote/modules/vmware/vmware.build b/remote/modules/vmware/vmware.build
index 29b7491f..2ff6e895 100644
--- a/remote/modules/vmware/vmware.build
+++ b/remote/modules/vmware/vmware.build
@@ -27,6 +27,12 @@ fetch_source() {
 build() {
 	local SRCDIR="./src/bundle"
 	[ ! -d "$SRCDIR" ] && perror "Extracted vmplayer bundle not found in $SRCDIR - please clean vmplayer module."
+	local PLAYER_MANIFEST="$MODULE_DIR/$SRCDIR/vmware-player-app/manifest.xml"
+	local WORKSTATION_MANIFEST="$MODULE_DIR/$SRCDIR/vmware-workstation/manifest.xml"
+	local BUILD_NUMBER=$(grep -o -E '<buildNumber>[0-9]*</buildNumber>' "$PLAYER_MANIFEST" | grep -o -E '[0-9]*')
+	local PLAYER_VERSION=$(grep -o -E '<version>[0-9\.]*</version>' "$PLAYER_MANIFEST" | grep -o -E '[0-9\.]*')
+	local WORKSTATION_VERSION=$(grep -o -E '<version>[0-9\.]*</version>' "$WORKSTATION_MANIFEST" 2>/dev/null | grep -o -E '[0-9\.]*')
+	local CORE_VERSION=$(grep -o -E '<coreVersion>[0-9\.]*</coreVersion>' "$PLAYER_MANIFEST" | grep -o -E '[0-9\.]*')
 	local TARGET="$MODULE_BUILD_DIR/usr/lib/vmware/"
 	mkdir -p "$TARGET"{lib,share,bin}
 	pinfo "Copying data to build dir"
@@ -60,6 +66,10 @@ build() {
 		sed -i 's#@@LIBCONF_DIR@@#/usr/lib/vmware/libconf#g' "$file"
 	done
 
+	# Copy vmware config template
+	mkdir -p "$MODULE_BUILD_DIR/etc/vmware"
+	sed "s#%PLAYER_VERSION%#$PLAYER_VERSION#g;s#%BUILD_NUMBER%#$BUILD_NUMBER#g" "$MODULE_DIR/templates/vmware/config" > "$MODULE_BUILD_DIR/etc/vmware/config"
+
 	# Compile kernel modules
 	pinfo "Compiling required kernel modules."
 	# build modules
@@ -72,7 +82,7 @@ post_copy() {
 	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
+	#fix vmware-usbarbitrator bug
 	date +'%Y.%m.%d' >"${TARGET_BUILD_DIR}/etc/arch-release"
 	copy_modules
 }
@@ -83,15 +93,11 @@ build_modules() {
 	local VMWARE_MODCONFIG="$MODULE_DIR/$SRCDIR/vmware-vmx/bin/vmware-modconfig"
 	[ -e "$VMWARE_MODCONFIG" ] && chmod +x "$VMWARE_MODCONFIG" || perror "Could not find $VMWARE_MODCONFIG"
 	# link vmware-modconfig-console in the build dir
-	local MANIFEST="$MODULE_DIR/$SRCDIR/vmware-vmx/manifest.xml"
-	local BUILD_NUMBER="$(grep -o -E '<buildNumber>[0-9]*</buildNumber>' "$MANIFEST"|grep -o -E '[0-9]*')"
-	local VERSION="$(grep -o -E '<version>[0-9\.]*</version>' "$MANIFEST"|grep -o -E '[0-9\.]*')"
-	local CORE_VERSION="$(grep -o -E '<coreVersion>[0-9\.]*</coreVersion>' "$MANIFEST"|grep -o -E '[0-9\.]*')"
 	# /etc/vmware/config gen
 	
-	sed -i.bak1 '/^ETCDIR/d;/^VMISETCDIR/d;/bootstrap/d' "$VMWARE_MODCONFIG"
-	sed -i.bak2 "s/libdir=.*/libdir=$(echo $MODULE_BUILD_DIR | escape_replace)\/usr\/lib\/vmware/g" "$VMWARE_MODCONFIG"
-	sed -i.bak3 "s#set -e#set -e\nPREFIX=\"/usr\"\nBINDIR=\"/usr/bin\"\nSBINDIR=\"/usr/sbin\"\nLIBDIR=\"/usr/lib\"\nDATADIR=\"/usr/share\"\nSYSCONFDIR=\"/etc\"\nDOCDIR=\"/usr/share/doc\"\nMANDIR=\"/usr/share/man\"\nINCLUDEDIR=\"/usr/include\"\nINITDIR=\"/etc\"\nINITSCRIPTDIR=\"/etc/init.d\"\nVMWARE_INSTALLER=\"/usr/lib/vmware-installer/$CORE_VERSION\"\nVERSION=\"$CORE_VERSION\"\nVMISVERSION=\"$CORE_VERSION\"\nVMISPYVERSION=\"25\"#g" "$VMWARE_MODCONFIG"
+	sed -i '/^ETCDIR/d;/^VMISETCDIR/d;/bootstrap/d' "$VMWARE_MODCONFIG"
+	sed -i "s/libdir=.*/libdir=$(echo $MODULE_BUILD_DIR | escape_replace)\/usr\/lib\/vmware/g" "$VMWARE_MODCONFIG"
+	sed -i "s#set -e#set -e\nPREFIX=\"/usr\"\nBINDIR=\"/usr/bin\"\nSBINDIR=\"/usr/sbin\"\nLIBDIR=\"/usr/lib\"\nDATADIR=\"/usr/share\"\nSYSCONFDIR=\"/etc\"\nDOCDIR=\"/usr/share/doc\"\nMANDIR=\"/usr/share/man\"\nINCLUDEDIR=\"/usr/include\"\nINITDIR=\"/etc\"\nINITSCRIPTDIR=\"/etc/init.d\"\nVMWARE_INSTALLER=\"/usr/lib/vmware-installer/$CORE_VERSION\"\nVERSION=\"$CORE_VERSION\"\nVMISVERSION=\"$CORE_VERSION\"\nVMISPYVERSION=\"25\"#g" "$VMWARE_MODCONFIG"
 	
 
 	[ -e "/etc/vmware/config" ] && cp "/etc/vmware/config" "/etc/vmware/config.mltk.bak"
@@ -113,17 +119,17 @@ authd.fullpath = "/usr/sbin/vmware-authd"
 bindir = "/usr/bin"
 vmware.fullpath = "/usr/bin/vmware"
 vix.libdir = "/usr/lib/vmware-vix"
-vix.config.version = "1" 
-player.product.version = "$VERSION"
+vix.config.version = "1"
+player.product.version = "$PLAYER_VERSION"
 product.buildNumber = "$BUILD_NUMBER"
 authd.client.port = "902"
 authd.proxy.nfc = "vmware-hostd:ha-nfc"
 authd.soapserver = "TRUE"
-product.version = "$VERSION"
-workstation.product.version = "$VERSION"
-product.name = "VMware Workstation"
+product.version = "$PLAYER_VERSION"
+workstation.product.version = "$WORKSTATION_VERSION"
+product.name = "VMware Player"
 EOF
- 	mkdir -p "$MODULE_BUILD_DIR/usr/lib/vmware/modules"
+	mkdir -p "$MODULE_BUILD_DIR/usr/lib/vmware/modules"
 	ln -sf "$MODULE_DIR/$SRCDIR/vmware-vmx/extra/modules.xml" "$MODULE_BUILD_DIR/usr/lib/vmware/modules/"
 	ln -sf "$MODULE_DIR/$SRCDIR/vmware-vmx/lib/modules/source" "$MODULE_BUILD_DIR/usr/lib/vmware/modules/"
 
-- 
cgit v1.2.3-55-g7522