Merge branch 'master' of dnbd3:openslx-ng/tm-scripts

10 files changed, 70 insertions, 26 deletions

diff --git a/remote/modules/vmware/data/etc/vmware-vix/bootstrap b/remote/modules/vmware/data/etc/vmware-vix/bootstrap
new file mode 100644
index 00000000..425074de
--- /dev/null
+++ b/remote/modules/vmware/data/etc/vmware-vix/bootstrap
@@ -0,0 +1,2 @@
+BINDIR="/usr/bin"
+
diff --git a/remote/modules/vmware/data/etc/vmware/bootstrap b/remote/modules/vmware/data/etc/vmware/bootstrap
new file mode 100644
index 00000000..0cc4af90
--- /dev/null
+++ b/remote/modules/vmware/data/etc/vmware/bootstrap
@@ -0,0 +1,12 @@
+PREFIX="/usr"
+BINDIR="/usr/bin"
+SBINDIR="/usr/sbin"
+LIBDIR="/usr/lib"
+DATADIR="/usr/share"
+SYSCONFDIR="/etc"
+DOCDIR="/usr/share/doc"
+MANDIR="/usr/share/man"
+INCLUDEDIR="/usr/include"
+INITDIR="/etc"
+INITSCRIPTDIR="/etc/init.d"
+
diff --git a/remote/modules/vmware/data/etc/vmware/config b/remote/modules/vmware/data/etc/vmware/config
deleted file mode 100644
index c76cc885..00000000
--- a/remote/modules/vmware/data/etc/vmware/config
+++ /dev/null
@@ -1,9 +0,0 @@
-.encoding = "UTF-8"
-prefvmx.minVmMemPct = "100"
-prefvmx.useRecommendedLockedMemSize = "TRUE"
-libdir = "/usr/lib/vmware"
-mks.ctlAltDel.ignore = "TRUE" 
-mks.fullscreen.allowScreenSaver = "TRUE" 
-fullScreenSwitch.onSeparateDesktop = "TRUE" 
-msg.autoAnswer = "TRUE"
-
diff --git a/remote/modules/vmware/data/etc/vmware/icu b/remote/modules/vmware/data/etc/vmware/icu
new file mode 120000
index 00000000..d1ebea7d
--- /dev/null
+++ b/remote/modules/vmware/data/etc/vmware/icu
@@ -0,0 +1 @@
+/usr/lib/vmware/icu
\ No newline at end of file
diff --git a/remote/modules/vmware/data/etc/vmware/locations b/remote/modules/vmware/data/etc/vmware/locations
new file mode 100644
index 00000000..2d419546
--- /dev/null
+++ b/remote/modules/vmware/data/etc/vmware/locations
@@ -0,0 +1,3 @@
+# Empty locations file to catch downgrade
+# to WS 6.0
+# OpenSLX: No idea what above means, but better have this file... ;-)
diff --git a/remote/modules/vmware/data/etc/vmware/usbarb.rules b/remote/modules/vmware/data/etc/vmware/usbarb.rules
new file mode 100644
index 00000000..ae107c7b
--- /dev/null
+++ b/remote/modules/vmware/data/etc/vmware/usbarb.rules
@@ -0,0 +1,4 @@
+{
+  "version": 1,
+  "rules": []
+}
diff --git a/remote/modules/vmware/templates/vmware/config b/remote/modules/vmware/templates/vmware/config
new file mode 100644
index 00000000..d8420e0d
--- /dev/null
+++ b/remote/modules/vmware/templates/vmware/config
@@ -0,0 +1,24 @@
+.encoding = "UTF-8"
+installerDefaults.componentDownloadEnabled = "no"
+installerDefaults.dataCollectionEnabled = "no"
+installerDefaults.transferVersion = "1"
+installerDefaults.autoSoftwareUpdateEnabled = "no"
+NETWORKING = "yes"
+VMBLOCK_CONFED = "yes"
+VMCI_CONFED = "yes"
+VSOCK_CONFED = "yes"
+gksu.rootMethod = "sudo"
+MemTrimRate = "0"
+prefvmx.minVmMemPct = "100"
+prefvmx.useRecommendedLockedMemSize = "TRUE"
+libdir = "/usr/lib/vmware"
+mks.ctlAltDel.ignore = "TRUE"
+mks.fullscreen.allowScreenSaver = "TRUE"
+fullScreenSwitch.onSeparateDesktop = "TRUE"
+msg.autoAnswer = "TRUE"
+authd.fullpath = "/usr/sbin/vmware-authd"
+bindir = "/usr/bin"
+vix.config.version = "1"
+player.product.version = "%PLAYER_VERSION%"
+product.buildNumber = "%BUILD_NUMBER%"
+
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/"
 
diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
index e872a283..6fe9a115 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
+++ b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
@@ -49,10 +49,10 @@ cp /etc/hostname /etc/hosts /etc/resolv.conf   "${FUTURE_ROOT}/etc/"
 
 # if booting with splash, suppress kernel output in stage32
 if [ $SPLASH -eq 1 ]; then
-	if grep -q -E "^\ *kernel.printk" "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"; then
-		sed -i 's/^\ *kernel\.printk.*/kernel\.printk\ =\ 0\ 0\ 0\ 0/g' "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"
+	if grep -q -E "^ *kernel.printk" "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"; then
+		sed -i 's/^ *kernel\.printk.*/kernel\.printk = 4 4 1 7/g' "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"
 	else
-		echo "kernel.printk = 0 0 0 0" >> "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"
+		echo "kernel.printk = 4 4 1 7" >> "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"
 	fi
 fi
 
diff --git a/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/50-mltk-blacklist.conf b/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/50-mltk-blacklist.conf
index 7a01777c..99869d23 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/50-mltk-blacklist.conf
+++ b/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/50-mltk-blacklist.conf
@@ -3,3 +3,4 @@
 # Intel corporation 82Q35 Express MEI controller spams syslog under
 # some 3.0 kernels
 # blacklist mei
+blacklist pcspkr