From 4912e44aa3f0b6ff11692405a9219e7d405376db Mon Sep 17 00:00:00 2001
From: Jack Knightly <J__A__K@hotmail.com>
Date: Sun, 5 Jun 2022 18:18:58 +0100
Subject: [PATCH] main/postmarketos-base: modify tm2-touchkey udev rule for
midas (MR 3192)
---
main/postmarketos-base/APKBUILD | 4 ++--
.../rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index fa7959e3e06..b2700a31f00 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,6 +1,6 @@
pkgname=postmarketos-base
pkgver=20
-pkgrel=0
+pkgrel=1
pkgdesc="Meta package for minimal postmarketOS base"
url="https://postmarketos.org"
arch="noarch"
@@ -114,7 +114,7 @@ e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67
01403df3b5a2be0dd70387a3c32cf24a77bc097679fbefca585082a0970b7d756723c33687be3809351b5e31c85947db84861118bfeced8f5f865fe2452555ec rootfs-etc-motd
093c201f0c7aa203df447f2a8c27e5834520a7016ce2934ddc35fb037d2ec9acf0f7df7c06e07ad24ba7b4d94ef21fe7ff848c58bd62277eeeb08659fbddf1e9 rootfs-etc-os-release
b70ee1b39b5f33c9a3e6bf4259158519691c82c8cefb700d4df49eb749a2cce208082e00d4905b9eea2c4f75b6da62f73931931c92157b4132adb35dcf0e0a6f rootfs-etc-sysctl.d-disable-rp-filter.conf
-443dfe94b63c5770bdc357faffad96f50f45e10c2687b33d4abb564e895dac1b5d19afe486758d19df811125548627945c9a60603f5e1126af921dead27af3fe rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
+01e042b5433a042d5100e21835c165866be14707f5c6ac7a857ec33e43ce40f470183d36a8e9ad201e00d9630b235f02dc00b3abcc1f25f814bc01c58c8f07e3 rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b15d7e18c4b40c3b19db387ee050a3baf03c4bd4293f4721e3 rootfs-lib-udev-rules.d-20-tm2-touchkey-leds.rules
1972174b97a99bcc58e87b3e093bdef260054f6aee1c1c345842a53991c2d5faf1b1ebc3c97f9dcf230f4d73ec06e27bf8ca3776527f999e3fd95877ff66d25b rootfs-lib-udev-rules.d-20-zinitix-input.rules
0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d rootfs-lib-udev-rules.d-50-firmware.rules
diff --git a/main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules b/main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
index 3bf706ccd11..db72828df96 100644
--- a/main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
+++ b/main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
@@ -1,3 +1,5 @@
-# map tm2-touchkey to KEY_MENU and KEY_BACK
-SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", \
+# map tm2-touchkey to KEY_MENU and KEY_BACK (main variant)
+SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", ATTRS{name}!="midas-touchkey", \
ENV{KEYBOARD_KEY_00}="menu", ENV{KEYBOARD_KEY_01}="back", RUN{builtin}+="keyboard"
+
+# (udev rule for mapping midas variants is unnecessary because the default key mapping is correct)
--
GitLab