Merge branch 'master' into installer

21 files changed, 38 insertions, 4 deletions

diff --git a/core/modules/slx-issue/templates/issue.template b/core/modules/slx-issue/templates/issue.template
index e4a91423..12a414db 100644
--- a/core/modules/slx-issue/templates/issue.template
+++ b/core/modules/slx-issue/templates/issue.template
@@ -1,5 +1,5 @@
    WELCOME TO %minspace% %hostname% (\l)
-            _____  ______  ______ __    __    _______ __     __    __
+           _____  ______  ______ __    __    _______ __     __    __
           /  _   |   _   |   ___|  |  |  |  |   ____|  |   |  |  |  |
          |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |        /  /
          |  | |  |   ___/|   _|      |   |   ____   |  |     |    |
diff --git a/core/modules/vmware15/data/opt/openslx/bin/vmplayer b/core/modules/vmware15/data/opt/openslx/bin/vmplayer
new file mode 100755
index 00000000..05a4ec3a
--- /dev/null
+++ b/core/modules/vmware15/data/opt/openslx/bin/vmplayer
@@ -0,0 +1,16 @@
+#!/bin/ash
+# radically simplified version of the original script vmplayer by VMware Inc.
+PREFIX=/usr/lib/vmware # depends on the vmware location
+
+# HACK: Let the OpenGL driver report s3tc capability even if not present, so 3D will be enabled
+export force_s3tc_enable=true
+
+# Turn off "helpful" DE features
+export APPMENU_DISPLAY_BOTH=1
+export UBUNTU_MENUPROXY=0
+export GNOME_DISABLE_CRASH_DIALOG=1
+
+PROG=$(basename $0)
+
+exec "$PREFIX/bin/$PROG" "$@"
+
diff --git a/core/modules/vmware15/data/opt/openslx/bin/vmware b/core/modules/vmware15/data/opt/openslx/bin/vmware
new file mode 120000
index 00000000..aa0b74b1
--- /dev/null
+++ b/core/modules/vmware15/data/opt/openslx/bin/vmware
@@ -0,0 +1 @@
+vmplayer
\ No newline at end of file
diff --git a/core/modules/vmware14/data/usr/bin/vmplayer b/core/modules/vmware15/data/usr/bin/vmplayer
index 2944838d..2944838d 120000
--- a/core/modules/vmware14/data/usr/bin/vmplayer
+++ b/core/modules/vmware15/data/usr/bin/vmplayer
diff --git a/core/modules/vmware14/data/usr/bin/vmware b/core/modules/vmware15/data/usr/bin/vmware
index bde6f9c0..bde6f9c0 120000
--- a/core/modules/vmware14/data/usr/bin/vmware
+++ b/core/modules/vmware15/data/usr/bin/vmware
diff --git a/core/modules/vmware14/module.build b/core/modules/vmware15/module.build
index ba8ad7e9..ba8ad7e9 100644
--- a/core/modules/vmware14/module.build
+++ b/core/modules/vmware15/module.build
diff --git a/core/modules/vmware14/module.conf b/core/modules/vmware15/module.conf
index 4201df04..2aa1b613 100644
--- a/core/modules/vmware14/module.conf
+++ b/core/modules/vmware15/module.conf
@@ -1,5 +1,5 @@
 #!/bin/bash
-REQUIRED_VERSION="14.0.0"
+REQUIRED_VERSION="15.1.0"
 REQUIRED_TYPE="workstation"
 REQUIRED_MODULES="kernel vmware-common slxlog"
 REQUIRED_DIRECTORIES="
diff --git a/core/modules/vmware14/patches/vmblock__3.0-3.9__1.0-100.0.patch b/core/modules/vmware15/patches/vmblock__3.0-3.9__1.0-100.0.patch
index 89b3a7c6..89b3a7c6 100644
--- a/core/modules/vmware14/patches/vmblock__3.0-3.9__1.0-100.0.patch
+++ b/core/modules/vmware15/patches/vmblock__3.0-3.9__1.0-100.0.patch
diff --git a/core/modules/vmware14/patches/vmblock__3.10__1.0-100.0.patch b/core/modules/vmware15/patches/vmblock__3.10__1.0-100.0.patch
index e54317f9..e54317f9 100644
--- a/core/modules/vmware14/patches/vmblock__3.10__1.0-100.0.patch
+++ b/core/modules/vmware15/patches/vmblock__3.10__1.0-100.0.patch
diff --git a/core/modules/vmware14/patches/vmblock__3.11-9.9__1.0-11.0.patch b/core/modules/vmware15/patches/vmblock__3.11-9.9__1.0-11.0.patch
index dedb2646..dedb2646 100644
--- a/core/modules/vmware14/patches/vmblock__3.11-9.9__1.0-11.0.patch
+++ b/core/modules/vmware15/patches/vmblock__3.11-9.9__1.0-11.0.patch
diff --git a/core/modules/vmware14/patches/vmci__4.3-4.3__12.0.0.patch b/core/modules/vmware15/patches/vmci__4.3-4.3__12.0.0.patch
index 05dae1b7..05dae1b7 100644
--- a/core/modules/vmware14/patches/vmci__4.3-4.3__12.0.0.patch
+++ b/core/modules/vmware15/patches/vmci__4.3-4.3__12.0.0.patch
diff --git a/core/modules/vmware14/patches/vmmon__4.14-4.14.99__12.0-14.0.patch b/core/modules/vmware15/patches/vmmon__4.14-4.14.99__12.0-14.0.patch
index 5278d645..5278d645 100644
--- a/core/modules/vmware14/patches/vmmon__4.14-4.14.99__12.0-14.0.patch
+++ b/core/modules/vmware15/patches/vmmon__4.14-4.14.99__12.0-14.0.patch
diff --git a/core/modules/vmware14/patches/vmmon__4.14__14.0.patch b/core/modules/vmware15/patches/vmmon__4.14__14.0.patch
index 5278d645..5278d645 100644
--- a/core/modules/vmware14/patches/vmmon__4.14__14.0.patch
+++ b/core/modules/vmware15/patches/vmmon__4.14__14.0.patch
diff --git a/core/modules/vmware14/patches/vmmon__4.3-4.3__12.0.0.patch b/core/modules/vmware15/patches/vmmon__4.3-4.3__12.0.0.patch
index 3f5a950a..3f5a950a 100644
--- a/core/modules/vmware14/patches/vmmon__4.3-4.3__12.0.0.patch
+++ b/core/modules/vmware15/patches/vmmon__4.3-4.3__12.0.0.patch
diff --git a/core/modules/vmware14/patches/vmmon__4.9-4.9.99__12.0.0-12.5.2.patch b/core/modules/vmware15/patches/vmmon__4.9-4.9.99__12.0.0-12.5.2.patch
index 054dd8a1..054dd8a1 100644
--- a/core/modules/vmware14/patches/vmmon__4.9-4.9.99__12.0.0-12.5.2.patch
+++ b/core/modules/vmware15/patches/vmmon__4.9-4.9.99__12.0.0-12.5.2.patch
diff --git a/core/modules/vmware14/patches/vmnet__3.13-3.13__1.0-10.0.2.patch b/core/modules/vmware15/patches/vmnet__3.13-3.13__1.0-10.0.2.patch
index 54607506..54607506 100644
--- a/core/modules/vmware14/patches/vmnet__3.13-3.13__1.0-10.0.2.patch
+++ b/core/modules/vmware15/patches/vmnet__3.13-3.13__1.0-10.0.2.patch
diff --git a/core/modules/vmware14/patches/vmnet__4.9-4.9.99__12.0.0-12.5.2.patch b/core/modules/vmware15/patches/vmnet__4.9-4.9.99__12.0.0-12.5.2.patch
index 18ef062b..18ef062b 100644
--- a/core/modules/vmware14/patches/vmnet__4.9-4.9.99__12.0.0-12.5.2.patch
+++ b/core/modules/vmware15/patches/vmnet__4.9-4.9.99__12.0.0-12.5.2.patch
diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons
index 5c6f86fd..8c14b0d4 100755
--- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons
+++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-download_slx_addons
@@ -30,7 +30,6 @@ if [ -z "${SLX_CONFIG_SERVERS}" ]; then
 fi
 
 # read base slx servers from cmdline
-BASE_MOUNT_POINT="/opt/openslx/mnt"
 DOWNLOAD_DEST="/run/addons"
 mkdir -p "$DOWNLOAD_DEST" || { echo "Failed to create $DOWNLOAD_DEST"; exit 1; }
 
@@ -53,7 +52,25 @@ if [ $# -eq 1 ]; then
 		echo "Already downloaded, doing nothing"
 		exit 0
 	fi
-	if ! download "${SLX_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"; then
+	# XXX HACK
+	# Select proper VMware version
+	FILE="$ADDON"
+	if [ "$ADDON" = "vmware" ]; then
+		vendor="$( awk '$1 == "vendor_id" {print $NF;exit}' /proc/cpuinfo )"
+		version=12
+		if [ "$vendor" = "GenuineIntel" ]; then
+			modprobe msr
+			flag="$( rdmsr --bitfield 5:5 0x485 )"
+			[ "$flag" = 1 ] && version=15
+		elif [ "$vendor" = "AuthenticAMD" ]; then
+			family="$( awk '$1$2 == "cpufamily" {print $NF;exit}' /proc/cpuinfo )"
+			[ "$family" -ge 21 ] && version=15
+		fi
+		FILE="vmware$version"
+		echo "Deciding to download $FILE instead of $ADDON after checking CPU"
+	fi
+	# XXX
+	if ! download "${SLX_BASE_PATH}/${FILE}.sqfs" "${ADDON_TARGET_PATH}"; then
 		slxlog --echo "addon-download" "Download of '${HTTP_BASE_PATH}/${ADDON}.sqfs' failed."
 		exit 1
 	fi
diff --git a/core/targets/vmware/kernel b/core/targets/vmware12/kernel
index 1369e8ff..1369e8ff 120000
--- a/core/targets/vmware/kernel
+++ b/core/targets/vmware12/kernel
diff --git a/core/targets/vmware/vmware b/core/targets/vmware12/vmware
index ea1b2f86..ea1b2f86 120000
--- a/core/targets/vmware/vmware
+++ b/core/targets/vmware12/vmware
diff --git a/core/targets/vmware/vmware-common b/core/targets/vmware12/vmware-common
index bae6192c..bae6192c 120000
--- a/core/targets/vmware/vmware-common
+++ b/core/targets/vmware12/vmware-common