samsung-{a3,a5,a7,klte,serranove}: Move 20-tm2-touchkey-input.rules to postmarketos-base

device/community/device-samsung-a3/20-tm2-touchkey-input.rules

-# remap the left key of tm2-touchkey to KEY_MENU
-SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", ENV{KEYBOARD_KEY_00}="menu", RUN{builtin}+="keyboard"

device/community/device-samsung-a3/APKBUILD

@@ -4,8 +4,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,6 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="
-	20-tm2-touchkey-input.rules
 	deviceinfo
 	rootston.ini
 "
@@ -36,8 +35,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/20-tm2-touchkey-input.rules \
-		"$pkgdir"/lib/udev/rules.d/20-tm2-touchkey-input.rules
 }
 
 nonfree_firmware() {
@@ -59,7 +56,6 @@ phosh() {
 }
 
 sha512sums="
-5a91ca375652bc9d2af90db4f446176a4fd43b5c924362219f6bf35e76de818cb4ecce105ee56b4511c3c0882bd055615f409516fade6dfcd30642cc147c1c5a  20-tm2-touchkey-input.rules
 dac014f2ebc1c461e43917fcfc020675c10ac39e17b83b0e0e2246b159db1f61ce024df21624f2635729f29521b30b4cce29b4451931cb27cf4d0f34b19ec509  deviceinfo
 f3667b914bb955be9e97db31dc7ed4a7c5d0c369be9549d587bb7208e270590c0c3fa36a0dd997d6f8305c5c9afb3b906423af6ca8724e806f995e61226cfc83  rootston.ini
 "

device/community/device-samsung-a5/20-tm2-touchkey-input.rules

-# remap the left key of tm2-touchkey to KEY_MENU
-SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", ENV{KEYBOARD_KEY_00}="menu", RUN{builtin}+="keyboard"

device/community/device-samsung-a5/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,10 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="
-	20-tm2-touchkey-input.rules
-	deviceinfo
-"
+source="deviceinfo"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -33,8 +30,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/20-tm2-touchkey-input.rules \
-		"$pkgdir"/lib/udev/rules.d/20-tm2-touchkey-input.rules
 }
 
 nonfree_firmware() {
@@ -47,6 +42,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-5a91ca375652bc9d2af90db4f446176a4fd43b5c924362219f6bf35e76de818cb4ecce105ee56b4511c3c0882bd055615f409516fade6dfcd30642cc147c1c5a  20-tm2-touchkey-input.rules
 ee496db47c95cb67b502c5f11d7390b679fbc8fc011eab1f9d7639b5df02c01501cb9963f638adaed93e6626a23e15be6d53b093f2b55f7d19108d06277939f7  deviceinfo
 "

device/community/device-samsung-serranove/20-tm2-touchkey-input.rules

-# remap the left key of tm2-touchkey to KEY_MENU
-SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", ENV{KEYBOARD_KEY_00}="menu", RUN{builtin}+="keyboard"

device/community/device-samsung-serranove/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=9
-pkgrel=1
+pkgver=10
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,7 +12,6 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="
-	20-tm2-touchkey-input.rules
 	77-modem-samsung-serranove.rules
 	deviceinfo
 	rootston.ini
@@ -35,8 +34,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/20-tm2-touchkey-input.rules \
-		"$pkgdir"/lib/udev/rules.d/20-tm2-touchkey-input.rules
 	install -Dm644 "$srcdir"/77-modem-samsung-serranove.rules \
 		"$pkgdir"/lib/udev/rules.d/77-modem-samsung-serranove.rules
 }
@@ -58,7 +55,6 @@ phosh() {
 }
 
 sha512sums="
-5a91ca375652bc9d2af90db4f446176a4fd43b5c924362219f6bf35e76de818cb4ecce105ee56b4511c3c0882bd055615f409516fade6dfcd30642cc147c1c5a  20-tm2-touchkey-input.rules
 4b747284acf73a401255093dfd7b6406fa8e3428307f031d39b1631d1a3ae6404789fc2dfff0cf2da6b2f0757071363cc70b4ef7d445c7b3c047b6feb88b9125  77-modem-samsung-serranove.rules
 d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e  deviceinfo
 94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea  rootston.ini

device/testing/device-samsung-a7/20-tm2-touchkey-input.rules

-# remap the left key of tm2-touchkey to KEY_MENU
-SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", ENV{KEYBOARD_KEY_00}="menu", RUN{builtin}+="keyboard"

device/testing/device-samsung-a7/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a7
 pkgdesc="Samsung Galaxy A7 (2015)"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,10 +15,7 @@ depends="
 	soc-qcom-msm8916-rproc
 "
 makedepends="devicepkg-dev"
-source="
-	20-tm2-touchkey-input.rules
-	deviceinfo
-"
+source="deviceinfo"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -30,8 +27,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/20-tm2-touchkey-input.rules \
-		"$pkgdir"/lib/udev/rules.d/20-tm2-touchkey-input.rules
 }
 
 nonfree_firmware() {
@@ -41,6 +36,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-5a91ca375652bc9d2af90db4f446176a4fd43b5c924362219f6bf35e76de818cb4ecce105ee56b4511c3c0882bd055615f409516fade6dfcd30642cc147c1c5a  20-tm2-touchkey-input.rules
 bc3787eccf092939b272f77a6c2febde13d963eb595147dff492e1dae2dc12b6f24b9efc4fdca3be90780d3ebfe4e1cec1b2023c8efd37774486fa34c70b10f7  deviceinfo
 "

device/testing/device-samsung-klte/20-tm2-touchkey-input.rules

-# remap the left key of tm2-touchkey to KEY_MENU
-SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", ENV{KEYBOARD_KEY_00}="menu", RUN{builtin}+="keyboard"

device/testing/device-samsung-klte/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F)"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -19,7 +19,6 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="
-	20-tm2-touchkey-input.rules
 	bt-module-deps.conf
 	deviceinfo
 "
@@ -30,8 +29,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/20-tm2-touchkey-input.rules \
-		"$pkgdir"/lib/udev/rules.d/20-tm2-touchkey-input.rules
 }
 
 nonfree_firmware() {
@@ -51,7 +48,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-5a91ca375652bc9d2af90db4f446176a4fd43b5c924362219f6bf35e76de818cb4ecce105ee56b4511c3c0882bd055615f409516fade6dfcd30642cc147c1c5a  20-tm2-touchkey-input.rules
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
 ddbf2140fdc4b3c50a78a5c946d2bec75debec68a89bfac6e1ad7b112af7c38e916ac056dbe69e266c229e3543427471375d3f5f362dcf35765e86a6bc0f4024  deviceinfo
 "

main/postmarketos-base/APKBUILD

 pkgname=postmarketos-base
-pkgver=17
+pkgver=18
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
@@ -41,6 +41,7 @@ _source644="
 	etc/issue
 	etc/motd
 	etc/os-release
+	lib/udev/rules.d/20-tm2-touchkey-input.rules
 	lib/udev/rules.d/20-tm2-touchkey-leds.rules
 	lib/udev/rules.d/50-firmware.rules
 	lib/udev/rules.d/95-rt5033-battery-refresh.rules
@@ -109,6 +110,7 @@ e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67
 45bd0742a64a9d3c4a88e152b97edcf3fa1edca28884f9ea69e7c4c365f1e41ef9056dbe204545de7d4b2ba92e1e5872b2a929c2dcc1dd468e627cc3f090b8e6  rootfs-etc-issue
 01403df3b5a2be0dd70387a3c32cf24a77bc097679fbefca585082a0970b7d756723c33687be3809351b5e31c85947db84861118bfeced8f5f865fe2452555ec  rootfs-etc-motd
 093c201f0c7aa203df447f2a8c27e5834520a7016ce2934ddc35fb037d2ec9acf0f7df7c06e07ad24ba7b4d94ef21fe7ff848c58bd62277eeeb08659fbddf1e9  rootfs-etc-os-release
+5a91ca375652bc9d2af90db4f446176a4fd43b5c924362219f6bf35e76de818cb4ecce105ee56b4511c3c0882bd055615f409516fade6dfcd30642cc147c1c5a  rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
 de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b15d7e18c4b40c3b19db387ee050a3baf03c4bd4293f4721e3  rootfs-lib-udev-rules.d-20-tm2-touchkey-leds.rules
 0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d  rootfs-lib-udev-rules.d-50-firmware.rules
 766aace60f7aea2515e03aec9f6d3215fcabcd81a235acb7b79bac1ae44e75c3087c541370fe1565a05a78f70a071fe20380b91e23e1fb48390b9df19354d008  rootfs-lib-udev-rules.d-95-rt5033-battery-refresh.rules

main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules

+# remap the left key of tm2-touchkey to KEY_MENU
+# map tm2-touchkey to KEY_MENU and KEY_BACK
+SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", \
+ENV{KEYBOARD_KEY_00}="menu", ENV{KEYBOARD_KEY_01}="back", RUN{builtin}+="keyboard"