[xorg] Include wacom drivers, support Ubuntu 16.04

Ubuntu 16.04 (and 14.04.5) dropped xserver-xorg-input-mouse for
some reason. Make it an optional include.

3 files changed, 46 insertions, 16 deletions

diff --git a/remote/modules/xorg/module.build b/remote/modules/xorg/module.build
index 16e0bb5b..f7678f65 100644
--- a/remote/modules/xorg/module.build
+++ b/remote/modules/xorg/module.build
@@ -12,11 +12,17 @@ build() {
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
 	# copy udev rules to correct location
-	[ -d "${MODULE_BUILD_DIR}/lib/udev" ] && mv "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/usr/lib/"	
+	if [ -d "${MODULE_BUILD_DIR}/lib/udev" ]; then
+		cp -r "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/usr/lib/"
+	fi
+	if [ -d "${MODULE_BUILD_DIR}/etc/udev" ]; then
+		cp -r "${MODULE_BUILD_DIR}/etc/udev" "${MODULE_BUILD_DIR}/usr/lib/"
+	fi
+	rm -rf -- "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/etc/udev"
 }
 
 post_copy() {
 	mkdir -p "${TARGET_BUILD_DIR}/etc/X11"
-	[ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X	
+	[ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X
 }
 
diff --git a/remote/modules/xorg/module.conf b/remote/modules/xorg/module.conf
index c98f9586..6aacc654 100644
--- a/remote/modules/xorg/module.conf
+++ b/remote/modules/xorg/module.conf
@@ -19,6 +19,9 @@ REQUIRED_DIRECTORIES="
 			/usr/share/X11
 			/usr/share/fonts
 			/etc/fonts
+			/usr/bin
+			/bin
+			/usr/lib/udev
 "
 REQUIRED_FILES="
 "
diff --git a/remote/modules/xorg/module.conf.ubuntu b/remote/modules/xorg/module.conf.ubuntu
index 807d8859..4f063440 100644
--- a/remote/modules/xorg/module.conf.ubuntu
+++ b/remote/modules/xorg/module.conf.ubuntu
@@ -1,11 +1,7 @@
 REQUIRED_INSTALLED_PACKAGES="
-	fonts-dejavu-core
-	fonts-dejavu-extra
-	ttf-dejavu-core
-	x11-xserver-utils
-	xdotool
-"
-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
@@ -15,17 +11,45 @@ REQUIRED_CONTENT_PACKAGES="
 			x11-xserver-utils
 			xdotool
 			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-mga$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$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
+"
+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
+			xkb-data
+			x11-xkb-utils
+			x11-xserver-utils
+			xdotool
+			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-mga$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-sisusb$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-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
@@ -38,9 +62,6 @@ REQUIRED_CONTENT_PACKAGES="
 			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
-			fonts-dejavu-core
-			fonts-dejavu-extra
-			ttf-dejavu-core
 "
 
 REQUIRED_DIRECTORIES+="