Merge pull request #1266 from lrusak/virtual

merge Virtual project into Generic

config/graphic

@@ -12,7 +12,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do

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"

packages/x11/xserver/xorg-server/udev.d/97-xorg.rules

@@ -25,7 +25,6 @@ GOTO="end_video"
 
 # check for drivers dont use the pci substem
 LABEL="subsystem_drivers"
-KERNEL=="vboxvideo", ENV{xorg_driver}="modesetting", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vboxvideo.service"
 KERNEL=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service"
 GOTO="end_video"
 

projects/Generic/filesystem/usr/share/bootloader/canupdate.sh

@@ -0,0 +1,2 @@
+# Allow upgrades from Virtual to Generic
+[ "$1" = "Virtual.x86_64" ] && exit 0 || exit 1

projects/Generic/linux/linux.x86_64.conf

@@ -3257,7 +3257,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

projects/Virtual/README.unsupported

@@ -1,9 +0,0 @@
-This is a testing project ONLY for developers.
-
-You are free to use it but there will be no support at all.
-
-To be absolutely clear there will be
-
-=== NO SUPPORT ===
-
-on this project.

projects/Virtual/options

@@ -1,97 +0,0 @@
-################################################################################
-# setup system defaults
-################################################################################
-
-  # The TARGET_CPU variable controls which processor should be targeted for
-  # generated code.
-    case $TARGET_ARCH in
-      x86_64)
-        # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-        #               athlon-fx amdfam10 barcelona
-        # (Intel CPUs)  atom core2 nocona
-        #
-        TARGET_CPU="x86-64"
-        ;;
-    esac
-
-  # Bootloader to use (syslinux / u-boot / atv-bootloader)
-    BOOTLOADER="syslinux"
-
-  # u-boot version to use (default)
-    UBOOT_VERSION="default"
-
-  # Configuration for u-boot
-    UBOOT_CONFIG=""
-
-  # Target Configfile for u-boot
-    UBOOT_CONFIGFILE=""
-
-  # Kernel target
-    KERNEL_TARGET="bzImage"
-
-  # Kernel extra targets to build
-    KERNEL_UBOOT_EXTRA_TARGET=""
-
-  # Additional kernel make parameters (for example to specify the u-boot loadaddress)
-    KERNEL_MAKE_EXTRACMD=""
-
-  # Kernel to use. values can be:
-  # default:  default mainline kernel
-    LINUX="default"
-
-
-################################################################################
-# setup build defaults
-################################################################################
-
-  # Project CFLAGS
-    PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse"
-
-  # SquashFS compression method (gzip / lzo / xz)
-    SQUASHFS_COMPRESSION="gzip"
-
-
-################################################################################
-# setup project defaults
-################################################################################
-
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
-  # OpenGL(X) implementation to use (no / mesa)
-    OPENGL="mesa"
-
-  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
-    OPENGLES="no"
-
-  # include uvesafb support (yes / no)
-    UVESAFB_SUPPORT="yes"
-
-  # Displayserver to use (x11 / no)
-    DISPLAYSERVER="x11"
-
-  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
-    KODIPLAYER_DRIVER="default"
-
-  # Modules to install in initramfs for early boot
-    INITRAMFS_MODULES=""
-
-  # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
-  # Space separated list is supported,
-  # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-    FIRMWARE="misc-firmware wlan-firmware dvb-firmware iwlwifi-firmware"
-
-  # additional drivers to install:
-  # for a list of additinoal drivers see packages/linux-drivers
-  # Space separated list is supported,
-  # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta media_build"
-
-  # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau,vmware,virtualbox)
-  # Space separated list is supported,
-  # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
-    GRAPHIC_DRIVERS="vmware"
-
-  # set the addon dirs
-    ADDON_PATH="$ADDON_VERSION/Generic/$TARGET_ARCH"
-    ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

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

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