[PATCH] Remove post-install X11 display rotation workaround
There's now no longer a need for rotating the display in userland, as the panel driver for cwd686 now reads rotation from devicetree.
Click to preview patch
From ed16ce16af3f1362adec496e7448a2c66dd0aef0 Mon Sep 17 00:00:00 2001
From: Max Fierke <max@maxfierke.com>
Date: Thu, 6 Jan 2022 22:04:49 -0600
Subject: [PATCH] Remove post-install X11 display rotation workaround
There's now no longer a need for rotating the display in userland,
as the panel driver for cwd686 now reads rotation from devicetree.
---
10-monitor.conf | 4 ----
PKGBUILD | 10 +++-------
clockworkpi-a06-post-install.install | 5 +++++
3 files changed, 8 insertions(+), 11 deletions(-)
delete mode 100644 10-monitor.conf
diff --git a/10-monitor.conf b/10-monitor.conf
deleted file mode 100644
index 39faeca..0000000
--- a/10-monitor.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Section "Monitor"
- Identifier "DSI-1"
- Option "Rotate" "right"
-EndSection
diff --git a/PKGBUILD b/PKGBUILD
index c5e2f44..2acaf3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,12 @@
pkgname=clockworkpi-a06-post-install
pkgver=20$(date +%y%m%d)
pkgrel=1
-pkgdesc="clockworkPI DevTerm A06 post install files"
+pkgdesc="ClockworkPi DevTerm A06 post-install files"
arch=('any')
-url="https://github.com/maxfierke/clockworkpi-a06-alarm"
+url="https://www.manjaro.org"
license=('GPL')
install=${pkgname}.install
-source=('10-monitor.conf')
-md5sums=('0939a3e65eca3ca2e8bd8f4f843eed47')
package() {
- echo "Modifying clockworkpi-a06 specific files..."
-
- install -Dm644 "${srcdir}/10-monitor.conf" "${pkgdir}/etc/X11/xorg.conf.d/10-monitor.conf"
+ echo "Modifying ClockworkPi DevTerm A06 specific files..."
}
diff --git a/clockworkpi-a06-post-install.install b/clockworkpi-a06-post-install.install
index e8ccea1..22fbfb5 100644
--- a/clockworkpi-a06-post-install.install
+++ b/clockworkpi-a06-post-install.install
@@ -16,6 +16,11 @@ post_install() {
}
post_upgrade() {
+ # Monitor rotation for ClockworkPI DevTerm A06 is now handled in devicetree
+ if [ -f /etc/X11/xorg.conf.d/10-monitor.conf ]; then
+ rm -f /etc/X11/xorg.conf.d/10-monitor.conf
+ fi
+
# Provide instructions
if ! grep -q '^MODULES=(.*rtc_rk808' /etc/mkinitcpio.conf; then
echo "To prevent journal corruption on boot, please add 'rtc_rk808' to the start"
--
2.33.1
0001-Remove-post-install-X11-display-rotation-workaround.patch