[xorg] Remove deprecated intel module, add qxl module

3 files changed, 2 insertions, 140 deletions

diff --git a/core/modules/xorg/module.conf.ubuntu b/core/modules/xorg/module.conf.ubuntu
index 4fbb0307..79316abe 100644
--- a/core/modules/xorg/module.conf.ubuntu
+++ b/core/modules/xorg/module.conf.ubuntu
@@ -26,10 +26,10 @@ REQUIRED_INSTALLED_PACKAGES="
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
 "
 REQUIRED_CONTENT_PACKAGES="
 			xterm
@@ -62,10 +62,10 @@ REQUIRED_CONTENT_PACKAGES="
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
diff --git a/core/modules/xorg/module.conf.ubuntu.16 b/core/modules/xorg/module.conf.ubuntu.16
deleted file mode 100644
index 6cdcb051..00000000
--- a/core/modules/xorg/module.conf.ubuntu.16
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-"
-REQUIRED_CONTENT_PACKAGES="
-			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
-			xkb-data
-			x11-xkb-utils
-			x11-xserver-utils
-			x11-utils
-			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
-"
-
-REQUIRED_DIRECTORIES+="
-			/usr/lib
-"
-REQUIRED_FILES=""
diff --git a/core/modules/xorg/module.conf.ubuntu.17 b/core/modules/xorg/module.conf.ubuntu.17
deleted file mode 100644
index e5b76dad..00000000
--- a/core/modules/xorg/module.conf.ubuntu.17
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-			fonts-dejavu-core
-			fonts-dejavu-extra
-			ttf-dejavu-core
-			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
-			xkb-data
-			x11-xkb-utils
-			x11-xserver-utils
-			x11-utils
-			xdotool
-			libtxc-dxtn-s2tc
-			libinput10
-			libwacom2
-			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
-			libdrm-dev
-			libgbm-dev
-			libgl-dev
-			libgl1-mesa-dev
-			libudev-dev
-			pkg-config
-			x11proto-core-dev
-			x11proto-dri2-dev
-			x11proto-fonts-dev
-			x11proto-randr-dev
-			x11proto-render-dev
-			x11proto-video-dev
-			x11proto-xext-dev
-			x11proto-xf86dri-dev
-			xserver-xorg-dev
-			xutils-dev
-"
-REQUIRED_CONTENT_PACKAGES="
-			fonts-dejavu-core
-			fonts-dejavu-extra
-			ttf-dejavu-core
-			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
-			libegl1-mesa
-			libgbm1
-			libcapnp-0.5.3
-			libmirclient9
-			libwayland-client0
-			libwayland-server0
-			xkb-data
-			x11-xkb-utils
-			x11-xserver-utils
-			x11-utils
-			xdotool
-			libtxc-dxtn-s2tc
-			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
-"
-# TODO: Required because the shipped ones crash on VT switch as of 2017-11-24
-# Remove when fixed in ubuntu repos
-REQUIRED_XORG_DRIVERS="
-	xf86-video-ati//xf86-video-ati-18.0.1
-	xf86-video-amdgpu//xf86-video-amdgpu-18.0.1
-"
-REQUIRED_LIBRARIES+="
-	amdgpu_drv
-	radeon_drv
-	ati_drv
-"