From 6806ae4a850fc7785a8c05304237cf53b5b8f951 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 23 Dec 2016 13:12:09 +0100
Subject: merge with latest dev version (tm-scripts commit
 f5a59daf8d70a9027118292cd40b18c221897408)

---
 core/modules/xorg/module.build | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'core/modules/xorg/module.build')

diff --git a/core/modules/xorg/module.build b/core/modules/xorg/module.build
index 16e0bb5b..8806fc9f 100644
--- a/core/modules/xorg/module.build
+++ b/core/modules/xorg/module.build
@@ -12,11 +12,19 @@ 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"
+	# This freezed/crashed X with certain gfx cards (radeon R240)
+	rm -f -- "${MODULE_BUILD_DIR}/usr/lib/xorg/modules/libglamoregl.so"
 }
 
 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
 }
 
-- 
cgit v1.2.3-55-g7522