From a51188bd680b5b5ee6b087b9896198cba0a43384 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Wed, 1 Feb 2017 16:47:13 -0800
Subject: [PATCH] Generic: merge Virtual project

---
 distributions/LibreELEC/options                   |  2 +-
 projects/{Virtual => Generic}/config/ovf.template |  0
 projects/Generic/linux/linux.x86_64.conf          |  3 ++-
 scripts/image                                     |  2 +-
 scripts/mkimage                                   | 14 +-------------
 5 files changed, 5 insertions(+), 16 deletions(-)
 rename projects/{Virtual => Generic}/config/ovf.template (100%)

diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 8246e6f476..9c33e1ad20 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -136,7 +136,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy wmware"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
diff --git a/projects/Virtual/config/ovf.template b/projects/Generic/config/ovf.template
similarity index 100%
rename from projects/Virtual/config/ovf.template
rename to projects/Generic/config/ovf.template
diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index a7b07682f1..ede223f951 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -3256,7 +3256,8 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
 # CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VMWGFX is not set
+CONFIG_DRM_VMWGFX=y
+CONFIG_DRM_VMWGFX_FBCON=y
 # CONFIG_DRM_GMA500 is not set
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_AST is not set
diff --git a/scripts/image b/scripts/image
index 62e170a0fb..c0f96fb74a 100755
--- a/scripts/image
+++ b/scripts/image
@@ -189,7 +189,7 @@ $SCRIPTS/install network
 [ "$REMOTE_SUPPORT" = "yes" ] && $SCRIPTS/install remote
 
 # Virtual image creation support
-[ "$PROJECT" = Virtual ] && $SCRIPTS/install virtual
+[ "$PROJECT" = "Generic" ] && $SCRIPTS/install virtual
 
 # Installer support
 [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer
diff --git a/scripts/mkimage b/scripts/mkimage
index 8ba9595592..1c9c87f73b 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -144,18 +144,6 @@ LABEL run
   APPEND boot=UUID=$UUID_SYSTEM disk=UUID=$UUID_STORAGE portable quiet
 EOF
 
-  if [ "$PROJECT" = Virtual ]; then
-    cat << EOF > "$LE_TMP"/syslinux.cfg
-DEFAULT virtual
-TIMEOUT 50
-PROMPT 0
-
-LABEL virtual
-  KERNEL /$KERNEL_NAME
-  APPEND boot=UUID=$UUID_SYSTEM disk=UUID=$UUID_STORAGE quiet tty vga=current
-EOF
-  fi
-
     mcopy "$LE_TMP/syslinux.cfg" ::
 
   # install extlinux
@@ -302,7 +290,7 @@ fi # bootloader
   fsck -n $LE_TMP/part1.fat >"$SAVE_ERROR" 2>&1 || show_error
 
 # create virtual images
-  if [ "$PROJECT" = Virtual ]; then
+  if [ "$PROJECT" = "Generic" ]; then
     echo "image: creating open virtual appliance..."
     qemu-img convert -O vmdk -o subformat=streamOptimized "$DISK" "$DISK.vmdk"
     sed -e "s,@DISTRO@,$DISTRO,g" -e "s,@DISK@,$(basename $DISK),g" -e "s,@DISK_SIZE@,$(ls -l $DISK.vmdk | awk '{print $5}'),g" $PROJECT_DIR/$PROJECT/config/ovf.template > $DISK.ovf