treewide: remove downstream feedbackd vibra rules

All of them are now included upstream with feedbackd, so we can remove them here. https://gitlab.freedesktop.org/agx/feedbackd/-/merge_requests/182 [ci:ignore-count] Part-of: https://gitlab.postmarketos.org/postmarketos/pmaports/-/merge_requests/6695
2025-07-12 16:19:48 +03:00 · 2025-06-21 11:18:52 +02:00 · 2025-06-21 11:18:52 +02:00 · 6a2c3f0818
commit 6a2c3f0818
parent 94fd3a01db
31 changed files with 25 additions and 112 deletions
--- a/device/community/device-fairphone-fp4/90-feedbackd-aw8695.rules
+++ b/device/community/device-fairphone-fp4/90-feedbackd-aw8695.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="aw8695-haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/device-fairphone-fp4/APKBUILD
+++ b/device/community/device-fairphone-fp4/APKBUILD
@ -2,8 +2,8 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=4
-pkgrel=2
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@ -37,7 +37,6 @@ makedepends="devicepkg-dev"
 subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp4.rules
-	90-feedbackd-aw8695.rules
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
@ -52,8 +51,6 @@ package() {

 	install -Dm644 "$srcdir"/81-libssc-fairphone-fp4.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-fairphone-fp4.rules
-	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-aw8695.rules
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
 		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 }
@ -74,7 +71,6 @@ openrc() {

 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
-2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
 97629090e9d08391ec9ee9f84cf40b9710c9dffc09609f056a27869acc8f87e176765f6e8f9800ef29872df8f48a2e085eeaaaf69f38f8a97ecb1d19ac9c79eb  deviceinfo
 6a3d620f2cc60308a62ff651ffb00a5ee1f092131cca9d33b6afd61c8a372a3fd7d46540162213593107e0943b33f3f0119d003d43dcd06dbde757390a6c1729  hexagonrpcd.confd
 52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
--- a/device/community/device-google-bonito/90-feedbackd-drv2624.rules
+++ b/device/community/device-google-bonito/90-feedbackd-drv2624.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="drv2624:haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/device-google-bonito/APKBUILD
+++ b/device/community/device-google-bonito/APKBUILD
@ -2,8 +2,8 @@
 # Maintainer: Anjandev Momi <anjan@momi.ca>
 pkgname=device-google-bonito
 pkgdesc="Google Pixel 3a XL"
-pkgver=4
-pkgrel=3
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@ -19,7 +19,6 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
-	90-feedbackd-drv2624.rules
 	deviceinfo
 	modules-initfs
 	q6voiced.conf
@ -36,9 +35,6 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/90-feedbackd-drv2624.rules \
-		-t "$pkgdir"/usr/lib/udev/rules.d
 }

 kernel_sdc() {
@ -71,7 +67,6 @@ nonfree_firmware() {
 }

 sha512sums="
-016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 e417f9a4da0dd595e34c520c10aef89e480336d9d57b66284a98777afce1dbc3dcda30f8a3a1c625b5e5e19aae4a95f28e00ca47e5d0e993ca922da5107bd837  deviceinfo
 1eb5f138619f499fab31ea64f63ee9f8984f195528708ec6a01ddc533c74cfb71d1442b97905ae15db24b8faac259fa3e89db357ca9c747ce3ee598c2d681639  modules-initfs
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
--- a/device/community/device-google-sargo/90-feedbackd-drv2624.rules
+++ b/device/community/device-google-sargo/90-feedbackd-drv2624.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="drv2624:haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/device-google-sargo/APKBUILD
+++ b/device/community/device-google-sargo/APKBUILD
@ -2,8 +2,8 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=10
-pkgrel=1
+pkgver=11
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@ -27,7 +27,6 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	81-libssc-google-sargo.rules
-	90-feedbackd-drv2624.rules
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
@ -44,8 +43,6 @@ package() {
 	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname

-	install -Dm644 "$srcdir"/90-feedbackd-drv2624.rules \
-		-t "$pkgdir"/usr/lib/udev/rules.d
 	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
 		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
@ -71,7 +68,6 @@ openrc() {

 sha512sums="
 089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
-016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 ad032b1a35cfcd4fc0c8df988430ee97b711e785b86cca68b7552b23a9a2e2b6b97c327e3415a575db47ad6c1f86ded18df5553acaae63010057d89b8c16135e  deviceinfo
 b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd.confd
 925d8b176a8f1b47a86a1026cc920ffae99ceb35c3e52c222654c15078907579d23c4d68ed65a98ab937f59aaba2bbdd74da8d273e8b9c1ac87a52f718d383d6  modules-initfs
--- a/device/community/device-nokia-n900/APKBUILD
+++ b/device/community/device-nokia-n900/APKBUILD
@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=45
+pkgver=46
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@ -79,7 +79,6 @@ source="
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
 	udev/15-bq27k.rules
-	udev/80-feedbackd-twl4030.rules
 	udev/90-touchscreen-dev.rules
 	upower.conf
 	x11-keymap
@ -128,8 +127,6 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/10-nokia-modem.rules
 	install -D -m644 "$srcdir"/15-bq27k.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/15-bq27xxx-battery.rules
-	install -Dm644 "$srcdir"/80-feedbackd-twl4030.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/80-feedbackd-twl4030.rules

 	# Keymap
 	install -D -m644 "$srcdir"/keymaps/rx51_us.bmap.gz \
@ -285,7 +282,6 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 42f916d87dd305111028992a1107bf6fe108bebbd782ae8edd065e76505db2b3a75e57515970c3e40cb0d1b7e83097a1bba92785be13df7c3fd80959a8d9c5c1  uboot-script.cmd
 465b9a0d2b46d0981c64b47cb1f656c2456a90b91b1751a2efad10af38a96030dd99108b1fd76ce31bf1ea0f236d55bed38b114d6bd712f09f8968de034c946c  10-nokia-modem.rules
 1acc441b9f83dc91fd65fa3f89b8205bfd72a465286bc181b4e7e92dd4b8c0bc5c20a18dab46ff3ee8ae70940efd7d767b3dfb920edb4c74377bd418b838693d  15-bq27k.rules
-03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 9b99feee42dd6bdd122769994c786d3127c41e0aa3321f19c82a9d3845cf07b522908621a31cbddd9599fe18c5c37127d9b4be4255cd7fa8e0e8983bf73eb41b  upower.conf
 c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085  x11-keymap
--- a/device/community/device-nokia-n900/udev/80-feedbackd-twl4030.rules
+++ b/device/community/device-nokia-n900/udev/80-feedbackd-twl4030.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="twl4030:vibrator", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/device-qcom-sm7150/90-feedbackd-aw8695.rules
+++ b/device/community/device-qcom-sm7150/90-feedbackd-aw8695.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="aw8695-haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/device-qcom-sm7150/90-feedbackd-drv260x.rules
+++ b/device/community/device-qcom-sm7150/90-feedbackd-drv260x.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="drv260x:haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/device-qcom-sm7150/90-feedbackd-pm6150.rules
+++ b/device/community/device-qcom-sm7150/90-feedbackd-pm6150.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="pm8xxx_vib_ffmemless", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/device-qcom-sm7150/APKBUILD
+++ b/device/community/device-qcom-sm7150/APKBUILD
@ -6,8 +6,8 @@

 pkgname=device-qcom-sm7150
 pkgdesc="Generic device package for Qualcomm SM7150 devices"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@ -40,9 +40,6 @@ subpackages="
 source="
 	30-initramfs-firmware.files
 	81-libssc-180-degrees.rules
-	90-feedbackd-aw8695.rules
-	90-feedbackd-drv260x.rules
-	90-feedbackd-pm6150.rules
 	deviceinfo
 	initfs-hook.sh
 "
@ -57,15 +54,6 @@ package() {
 	install -Dm644 "$srcdir"/30-initramfs-firmware.files -t \
 		"$pkgdir"/usr/share/mkinitfs/files

-	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules -t \
-		"$pkgdir"/usr/lib/udev/rules.d
-
-	install -Dm644 "$srcdir"/90-feedbackd-drv260x.rules -t \
-		"$pkgdir"/usr/lib/udev/rules.d
-
-	install -Dm644 "$srcdir"/90-feedbackd-pm6150.rules -t \
-		"$pkgdir"/usr/lib/udev/rules.d
-
 	install -Dm644 "$srcdir"/81-libssc-180-degrees.rules -t \
 		"$pkgdir"/usr/lib/udev/rules.d
 }
@ -86,9 +74,6 @@ openrc() {
 sha512sums="
 73438ceec8ca76dec24a92718d456d17b01a23510ee0b0e6c1263e3f6c2ca82263a3e41298c0a8ebf3dd8439da354fc1c914fd475ad1cf5c669c200770df62fa  30-initramfs-firmware.files
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-180-degrees.rules
-2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-66ce9f37c0f1c9fabadec4fd4fe4d03a5a54df183a430a1cdaff24d6b22ce29be444ae07cfd17432f81f566b320567732a4b38715226fc349b4df2ceb8bca629  90-feedbackd-drv260x.rules
-90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm6150.rules
 f38e438c79dadda0eef3abe5c55ad69f8947bf39e5c57e03b7cba7a60b09091e326c525e2451de446ab6de9e92a6d4e39da32ef854cc285bde2e7d56f7b7d10d  deviceinfo
 8cfd961424d97242f8be42750377315825039891362bf5fbead7de9cbaaf50be34fd35e9c3ac2f981c7c3138243544f162182020b8a5a56779474476d84a7775  initfs-hook.sh
 "
--- a/device/community/device-samsung-m0/APKBUILD
+++ b/device/community/device-samsung-m0/APKBUILD
@ -3,7 +3,7 @@
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
 pkgver=9
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@ -14,7 +14,6 @@ depends="
 	mkbootimg
 	postmarketos-base
 	soc-samsung-exynos4412-cameraflash
-	soc-samsung-exynos4412-haptics
 	"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
--- a/device/community/soc-qcom-msm8916/90-feedbackd-pm8916.rules
+++ b/device/community/soc-qcom-msm8916/90-feedbackd-pm8916.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="pm8xxx_vib_ffmemless", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/soc-qcom-msm8916/APKBUILD
+++ b/device/community/soc-qcom-msm8916/APKBUILD
@ -2,7 +2,7 @@
 # Co-Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
-pkgver=22
+pkgver=23
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@ -23,14 +23,11 @@ _ucm_commit="3deea2860ab680c3e790442dbdf578fef152e639"
 source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
 	q6voiced.conf
 	77-modem-samsung-msm8916.rules
-	90-feedbackd-pm8916.rules
 	adreno-a306-quirks.sh
 	"

 package() {
 	mkdir -p "$pkgdir"
-	install -Dm644 "$srcdir"/90-feedbackd-pm8916.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-pm8916.rules
 }

 # Upstream keeps making breaking changes to UCM in patch releases.
@ -105,6 +102,5 @@ sha512sums="
 eee73ae7895fb6772b35a190956d17642d08af47a0fa5dfd022052c5b30c99cf9649215aef161ddcc21fac236f2a1435ab906462c7458b4e99e405b6cb6ef5f8  soc-qcom-msm8916-3deea2860ab680c3e790442dbdf578fef152e639.tar.gz
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 bcebc36ec62140f4620d462be2b95858adae380e5d74f6b9c9b956fb76a6541f39749f4dcec6ac3c39b868dbfed6fac7a34ba357510532a3df2d39f7ea818d55  77-modem-samsung-msm8916.rules
-90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8916.rules
 de35a32f697247e4a8419647b9c9fece9bc7f41c0e2377d01659ad0dc1ba21b08d3227193053d7cd1ec5006370db574472516f0d0061fb9d2d9509f27f6212d3  adreno-a306-quirks.sh
 "
--- a/device/community/soc-qcom-msm8953/90-feedbackd-pm8xxx-vib.rules
+++ b/device/community/soc-qcom-msm8953/90-feedbackd-pm8xxx-vib.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="pm8xxx_vib_ffmemless", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/soc-qcom-msm8953/APKBUILD
+++ b/device/community/soc-qcom-msm8953/APKBUILD
@ -4,8 +4,8 @@
 # Co-Maintainer: Danila Tikhonov (JIaxyga) <danila@mainlining.org>
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
-pkgver=13
-pkgrel=2
+pkgver=14
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@ -21,15 +21,13 @@ subpackages="
 _ucm_commit="f6dfc9b072e74b0ab2afcf452bc106242049ef28"
 source="
 	$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8953-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
-	90-feedbackd-pm8xxx-vib.rules
 	q6voiced.conf
 	adreno-a506-quirks.sh
 	moto-modem-rfs-setup.openrc
 "

 package() {
-	install -Dm644 "$srcdir"/90-feedbackd-pm8xxx-vib.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-pm8xxx-vib.rules
+	mkdir -p "$pkgdir"
 }

 ucm() {
@ -75,7 +73,6 @@ gpu() {

 sha512sums="
 8aadc874c8a334e46c7bf630874c3035070aa7b9052deba1a28ae059ab9d63dd99dfb82c1a58d09da5063ad250de813e3974e040ce938a53347e390ce2e450eb  soc-qcom-msm8953-f6dfc9b072e74b0ab2afcf452bc106242049ef28.tar.gz
-90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8xxx-vib.rules
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 4f9af3c582ae611d42fc058f949f60a96fc7cc884052e4c9f82e0292d57bba3b3cb8ace1d512b5a59535caa633be8558246a7519c2d067b7980f4088f452df6d  adreno-a506-quirks.sh
 d4fd0f3406c9f004e9cae7bc500c5713aab75f102f8e3ea1af820865f01eb03def01cd9ed3e8a184c7dfc22ab419628fad17957a3782885d96eb36e94461e842  moto-modem-rfs-setup.openrc
--- a/device/community/soc-qcom-msm8996/90-feedbackd-spmi-haptics.rules
+++ b/device/community/soc-qcom-msm8996/90-feedbackd-spmi-haptics.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="spmi_haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/soc-qcom-msm8996/APKBUILD
+++ b/device/community/soc-qcom-msm8996/APKBUILD
@ -1,8 +1,8 @@
 # Maintainer: Yassine Oudjana (Tooniis) <y.oudjana@protonmail.com>
 pkgname=soc-qcom-msm8996
 pkgdesc="Common package for Qualcomm MSM8996 devices"
-pkgver=1
-pkgrel=4
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@ -15,13 +15,10 @@ subpackages="
 _ucm_commit="9f2fd084eccbb01c5bffa6dbc50dcd2b116371d8"
 source="
 	alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/msm8996-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz
-	90-feedbackd-spmi-haptics.rules
 	"

 package() {
 	mkdir -p "$pkgdir"
-	install -Dm644 "$srcdir"/90-feedbackd-spmi-haptics.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-spmi-haptics.rules
 }

 nonfree_firmware() {
@ -40,5 +37,4 @@ ucm() {
 }
 sha512sums="
 11183d9cc3b3bd01aaed64dccf166521c028b24bb2f9cb7deeba9488fb7306cef64ecfb414bd1dc157d731dcddd79a23a59eb016f5c5273d1e9df2f0391122a6  alsa-ucm-conf-9f2fd084eccbb01c5bffa6dbc50dcd2b116371d8.tar.gz
-4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-spmi-haptics.rules
 "
--- a/device/community/soc-qcom/90-feedbackd-pmi8998.rules
+++ b/device/community/soc-qcom/90-feedbackd-pmi8998.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="spmi_haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/soc-qcom/APKBUILD
+++ b/device/community/soc-qcom/APKBUILD
@ -1,8 +1,8 @@
 # Maintainer: Casey Connolly <kcxt@postmarketos.org>
 pkgname=soc-qcom
 pkgdesc="Common package for Qualcomm devices"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@ -35,7 +35,6 @@ subpackages="

 source="
 	51-qcom.conf
-	90-feedbackd-pmi8998.rules
 	UPower.conf
 	call_audio_idle_suspend_workaround.confd
 	call_audio_idle_suspend_workaround.initd
@ -48,8 +47,6 @@ source="

 package() {
 	mkdir -p "$pkgdir"
-	install -Dm644 "$srcdir"/90-feedbackd-pmi8998.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-pmi8998.rules

 	# Shutdown when battery is critical instead of sleep
 	install -Dm644 "$srcdir"/UPower.conf \
@ -163,7 +160,6 @@ pulseaudio_systemd() {

 sha512sums="
 28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom.conf
-4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
--- a/device/community/soc-samsung-exynos4412/90-feedbackd-max77693-haptic.rules
+++ b/device/community/soc-samsung-exynos4412/90-feedbackd-max77693-haptic.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="max77693-haptic", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/community/soc-samsung-exynos4412/APKBUILD
+++ b/device/community/soc-samsung-exynos4412/APKBUILD
@ -1,7 +1,7 @@
 # Maintainer: Newbyte <newbyte@disroot.org>
 pkgname=soc-samsung-exynos4412
 pkgdesc="Common package for Samsung Exynos 4412 devices"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@ -9,11 +9,9 @@ arch="armv7"
 options="!check !archcheck !tracedeps"
 subpackages="
 	$pkgname-cameraflash
-	$pkgname-haptics
 "
 source="
 	60-flashlight.rules
-	90-feedbackd-max77693-haptic.rules
 "

 package() {
@ -26,13 +24,6 @@ cameraflash() {
 		-t "$subpkgdir"/usr/lib/udev/rules.d
 }

-haptics() {
-	# feedbackd haptics udev rules
-	install -Dm644 "$srcdir"/90-feedbackd-max77693-haptic.rules \
-		"$subpkgdir"/usr/lib/udev/rules.d/90-feedbackd-max77693-haptic.rules
-}
-
 sha512sums="
 9170da7ac869254644f2fc8d914102f2c16e917dbeb53e33b96c76936711d0540f55fa5c2526d73d5fe244500bc2728bc9d629e2524cf52c573d11e833aee666  60-flashlight.rules
-083bd692bd52f6ea2dc80351b91c24d8856d3ecd68bb2823dd821073c31b0f2d4556a2b5d861bf4b709cb3b1a4dc4d28648834ee2dd09b795ebfa3b30182ae94  90-feedbackd-max77693-haptic.rules
 "
--- a/device/testing/device-samsung-m3/APKBUILD
+++ b/device/testing/device-samsung-m3/APKBUILD
@ -3,7 +3,7 @@
 pkgname=device-samsung-m3
 pkgdesc="Samsung Galaxy S III LTE"
 pkgver=10
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@ -14,7 +14,6 @@ depends="
 	mkbootimg
 	postmarketos-base
 	soc-samsung-exynos4412-cameraflash
-	soc-samsung-exynos4412-haptics
 	"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
--- a/device/testing/device-samsung-t03g/APKBUILD
+++ b/device/testing/device-samsung-t03g/APKBUILD
@ -2,7 +2,7 @@
 pkgname=device-samsung-t03g
 pkgdesc="Samsung Galaxy Note II (GSM)"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@ -12,7 +12,6 @@ depends="
 	mkbootimg
 	postmarketos-base
 	soc-samsung-exynos4412-cameraflash
-	soc-samsung-exynos4412-haptics
 "
 makedepends="devicepkg-dev"
 subpackages="
--- a/device/testing/device-samsung-t0lte/APKBUILD
+++ b/device/testing/device-samsung-t0lte/APKBUILD
@ -2,7 +2,7 @@
 pkgname=device-samsung-t0lte
 pkgdesc="Samsung Galaxy Note II LTE"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@ -12,7 +12,6 @@ depends="
 	mkbootimg
 	postmarketos-base
 	soc-samsung-exynos4412-cameraflash
-	soc-samsung-exynos4412-haptics
 "
 makedepends="devicepkg-dev"
 subpackages="
--- a/device/testing/device-xiaomi-miatoll/90-feedbackd-aw8695.rules
+++ b/device/testing/device-xiaomi-miatoll/90-feedbackd-aw8695.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="aw8695-haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/testing/device-xiaomi-miatoll/90-feedbackd-drv2624.rules
+++ b/device/testing/device-xiaomi-miatoll/90-feedbackd-drv2624.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="drv2624:haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
--- a/device/testing/device-xiaomi-miatoll/APKBUILD
+++ b/device/testing/device-xiaomi-miatoll/APKBUILD
@ -2,7 +2,7 @@
 # Maintainer: Nikroks <nikroks@mainlining.org>
 pkgname=device-xiaomi-miatoll
 pkgdesc="Xiaomi Redmi Note 9 Pro / Redmi Note 9S"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@ -24,8 +24,6 @@ source="
 	hexagonrpcd.confd
 	modules-initfs
 	81-libssc-xiaomi-miatoll.rules
-	90-feedbackd-aw8695.rules
-	90-feedbackd-drv2624.rules
 "

 subpackages="
@ -39,12 +37,6 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules -t \
-		"$pkgdir"/usr/lib/udev/rules.d
-
-	install -Dm644 "$srcdir"/90-feedbackd-drv2624.rules \
-		-t "$pkgdir"/usr/lib/udev/rules.d
 }

 nonfree_firmware() {
@ -74,6 +66,4 @@ sha512sums="
 9a70ba5c036f2d3dc90c5c34a1d5bf0ef0805a19e5b49cd2821897bf3e6fe8af0cd2148aebb263807359ac616958da1c4032d85079d91d975f4bf220df1028ea  hexagonrpcd.confd
 9c1e77fd27ca8efb288099ed48f5f4cad71ae29a9c76a96d6aef471d3870a7aee3548cd0ed892407d5ce391814cf88145d22e1eba148e7008634c06700eecfbc  modules-initfs
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-xiaomi-miatoll.rules
-2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 "
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@ -1,6 +1,6 @@
 pkgname=postmarketos-base
-pkgver=44
-pkgrel=5
+pkgver=45
+pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
 arch="noarch"
@ -77,7 +77,6 @@ _source644="
 	usr/lib/udev/rules.d/20-tm2-touchkey-input.rules
 	usr/lib/udev/rules.d/20-tm2-touchkey-leds.rules
 	usr/lib/udev/rules.d/20-zinitix-input.rules
-	usr/lib/udev/rules.d/90-feedbackd-regulator-haptic.rules
 	usr/share/mkinitfs/files/postmarketos-base.files
 	"
 _source755="
@ -235,7 +234,6 @@ b70ee1b39b5f33c9a3e6bf4259158519691c82c8cefb700d4df49eb749a2cce208082e00d4905b9e
 b61c6116f972df08f460494cf3b511b7cb4046a65bb3bd840cddb5ca98518c4514dc5f8a9330bc9ac630e5adbfecc839cbd21f70cac5000a30fd2daeab0f02d7  rootfs-usr-lib-udev-rules.d-20-tm2-touchkey-input.rules
 de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b15d7e18c4b40c3b19db387ee050a3baf03c4bd4293f4721e3  rootfs-usr-lib-udev-rules.d-20-tm2-touchkey-leds.rules
 7396c2adc7808a995162cd20c0e8b327675eb5e616e936e65887a4581eb4d134f9911202bb269e0541643d0c1cb6955bf590bc4df8bafc6ecf2bf7fc63385e3c  rootfs-usr-lib-udev-rules.d-20-zinitix-input.rules
-f5c6913040a0448c346fdd0b5dbea865a3ac92ac1a21646d32753e6521642a27b061c314f10a14b612b78aa6bc8d3209e51f7ced95c478f1be55e478ff04067b  rootfs-usr-lib-udev-rules.d-90-feedbackd-regulator-haptic.rules
 d89a7e4b9d601431c62c11f83c9c72fdb90384d9100ee5fc4aff25dda0836fd3bf9e48c0536615be791374459eb8fbaf36d27358d4402ce768a9b9a32bed4f93  rootfs-usr-share-mkinitfs-files-postmarketos-base.files
 3c049c5e6fbe3079ac333f416cbaf5d3890a7941b79d68741bfc861ee94358fba6d8b72614fe99ab84563f9208613037c6702a7d0fc5a6dfa9d0518b5a13b0cb  rootfs-etc-init.d-deferred-initcalls
 42d6bce78b6e3c118dcbd9228b138661a05f8f321f17457e8df8f2398c0b780399d8d056f0a7c50d91557ac8698ab37dde61ec1a13fd69a7b3faad092f126580  rootfs-etc-init.d-swapfile
--- a/main/postmarketos-base/rootfs-usr-lib-udev-rules.d-90-feedbackd-regulator-haptic.rules
+++ b/main/postmarketos-base/rootfs-usr-lib-udev-rules.d-90-feedbackd-regulator-haptic.rules
@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="regulator-haptic", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
				`@ -1 +0,0 @@`
				`SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="aw8695-haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"`