summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSimon Rettberg2019-05-29 15:59:15 +0200
committerroot2019-05-29 15:59:15 +0200
commitc8bd0bfc1167a49853da902f13edbab48a133b33 (patch)
treeee3dcca9ff2f0ed0cb71eb024aaf5b29e9039df9 /core
parent[lightdm-greeter-bwlp] Download login-news on startup (diff)
downloadmltk-c8bd0bfc1167a49853da902f13edbab48a133b33.tar.gz
mltk-c8bd0bfc1167a49853da902f13edbab48a133b33.tar.xz
mltk-c8bd0bfc1167a49853da902f13edbab48a133b33.zip
[vmware15] Update vom 14 to 15
Diffstat (limited to 'core')
-rwxr-xr-xcore/modules/vmware15/data/opt/openslx/bin/vmplayer16
l---------core/modules/vmware15/data/opt/openslx/bin/vmware1
l---------core/modules/vmware15/data/usr/bin/vmplayer (renamed from core/modules/vmware14/data/usr/bin/vmplayer)0
l---------core/modules/vmware15/data/usr/bin/vmware (renamed from core/modules/vmware14/data/usr/bin/vmware)0
-rw-r--r--core/modules/vmware15/module.build (renamed from core/modules/vmware14/module.build)0
-rw-r--r--core/modules/vmware15/module.conf (renamed from core/modules/vmware14/module.conf)2
-rw-r--r--core/modules/vmware15/patches/vmblock__3.0-3.9__1.0-100.0.patch (renamed from core/modules/vmware14/patches/vmblock__3.0-3.9__1.0-100.0.patch)0
-rw-r--r--core/modules/vmware15/patches/vmblock__3.10__1.0-100.0.patch (renamed from core/modules/vmware14/patches/vmblock__3.10__1.0-100.0.patch)0
-rw-r--r--core/modules/vmware15/patches/vmblock__3.11-9.9__1.0-11.0.patch (renamed from core/modules/vmware14/patches/vmblock__3.11-9.9__1.0-11.0.patch)0
-rw-r--r--core/modules/vmware15/patches/vmci__4.3-4.3__12.0.0.patch (renamed from core/modules/vmware14/patches/vmci__4.3-4.3__12.0.0.patch)0
-rw-r--r--core/modules/vmware15/patches/vmmon__4.14-4.14.99__12.0-14.0.patch (renamed from core/modules/vmware14/patches/vmmon__4.14-4.14.99__12.0-14.0.patch)0
-rw-r--r--core/modules/vmware15/patches/vmmon__4.14__14.0.patch (renamed from core/modules/vmware14/patches/vmmon__4.14__14.0.patch)0
-rw-r--r--core/modules/vmware15/patches/vmmon__4.3-4.3__12.0.0.patch (renamed from core/modules/vmware14/patches/vmmon__4.3-4.3__12.0.0.patch)0
-rw-r--r--core/modules/vmware15/patches/vmmon__4.9-4.9.99__12.0.0-12.5.2.patch (renamed from core/modules/vmware14/patches/vmmon__4.9-4.9.99__12.0.0-12.5.2.patch)0
-rw-r--r--core/modules/vmware15/patches/vmnet__3.13-3.13__1.0-10.0.2.patch (renamed from core/modules/vmware14/patches/vmnet__3.13-3.13__1.0-10.0.2.patch)0
-rw-r--r--core/modules/vmware15/patches/vmnet__4.9-4.9.99__12.0.0-12.5.2.patch (renamed from core/modules/vmware14/patches/vmnet__4.9-4.9.99__12.0.0-12.5.2.patch)0
l---------core/targets/vmware12/kernel (renamed from core/targets/vmware/kernel)0
l---------core/targets/vmware12/vmware (renamed from core/targets/vmware/vmware)0
l---------core/targets/vmware12/vmware-common (renamed from core/targets/vmware/vmware-common)0
19 files changed, 18 insertions, 1 deletions
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 cfb6fb39..cfb6fb39 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 d05d9ca9..e41850b1 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"
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/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