From 899a9f2fcb5c7ee3b897d9e1cff49b64bd5dfd68 Mon Sep 17 00:00:00 2001
From: JMCC <JMCC@localhost>
Date: Sat, 15 Feb 2020 14:51:00 +0100
Subject: [PATCH] Fix temporarily disabling glamor for bionic due to Mesa bug

---
 lib/makeboarddeb.sh                                      | 9 ++++-----
 .../common/etc/X11/xorg.conf.d/01-armbian-defaults.conf  | 5 -----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh
index a104c96c1a..33744db2df 100644
--- a/lib/makeboarddeb.sh
+++ b/lib/makeboarddeb.sh
@@ -163,11 +163,10 @@ create_board_package()
 	if [[ $RELEASE == bionic ]]; then
 		cat <<-EOF >> "${destination}"/DEBIAN/postinst
 		# temporally disable acceleration in Bionic due to broken mesa packages
-		if [ -n "\$(cat /etc/X11/xorg.conf.d/01-armbian-defaults.conf 2> /dev/null | grep AccelMethod)" ]; then
-		        sed -i '/\Device/,/^\[/ s/AccelMethod".*/AccelMethod"\t "none"/' /etc/X11/xorg.conf.d/01-armbian-defaults.conf
-		else
-		        sed -i '/\Device/a \\\tOption\t\t\t"AccelMethod" "none"' /etc/X11/xorg.conf.d/01-armbian-defaults.conf
-		fi
+		echo 'Section "Device"
+			Identifier "Default Device"
+			Option "AccelMethod" "none"
+		EndSection' >> /etc/X11/xorg.conf.d/01-armbian-defaults.conf
 		EOF
 	fi
 
diff --git a/packages/bsp/common/etc/X11/xorg.conf.d/01-armbian-defaults.conf b/packages/bsp/common/etc/X11/xorg.conf.d/01-armbian-defaults.conf
index 98dbcb34af..7201e45c07 100644
--- a/packages/bsp/common/etc/X11/xorg.conf.d/01-armbian-defaults.conf
+++ b/packages/bsp/common/etc/X11/xorg.conf.d/01-armbian-defaults.conf
@@ -8,8 +8,3 @@ Section "ServerFlags"
 	Option			"SuspendTime" "0"
 	Option			"OffTime" "0"
 EndSection
-Section "Device"
-    Identifier  "Default Device"
-    Driver      "modesetting"
-    Option      "AccelMethod"    "glamor"
-EndSection