From 9ead87ee797a53e8c8df64af5ef5e73cdcaed17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Sat, 16 Nov 2024 18:24:51 +0100
Subject: [PATCH] device-qcom-msm8953: Move to community
Replace individual msm8953 xiaomi packages with generic msm8953 package.
Move device-xaiomi-daisy-fake-goodix package to the generic device
package.
[ci:ignore-count] [ci:skip-vercheck]
---
CODEOWNERS | 1 +
.../90-device-xiaomi-daisy.rules | 0
.../device-xiaomi-daisy/APKBUILD | 0
.../device-xiaomi-daisy/deviceinfo | 0
.../device-xiaomi-daisy/modules-initfs | 0
.../device-xiaomi-markw/APKBUILD | 0
.../device-xiaomi-markw/deviceinfo | 0
.../device-xiaomi-markw/modules-initfs | 0
.../device-xiaomi-mido/APKBUILD | 0
.../device-xiaomi-mido/deviceinfo | 0
.../device-xiaomi-mido/modules-initfs | 0
.../device-xiaomi-onclite/APKBUILD | 0
.../device-xiaomi-onclite/deviceinfo | 0
.../device-xiaomi-onclite/modules-initfs | 0
.../device-xiaomi-rosy/APKBUILD | 0
.../device-xiaomi-rosy/deviceinfo | 0
.../device-xiaomi-rosy/modules-initfs | 0
.../device-xiaomi-tissot/APKBUILD | 0
.../device-xiaomi-tissot/deviceinfo | 0
.../device-xiaomi-tissot/modules-initfs | 0
.../device-xiaomi-vince/APKBUILD | 0
.../device-xiaomi-vince/deviceinfo | 0
.../device-xiaomi-vince/modules-initfs | 0
.../device-xiaomi-ysl/APKBUILD | 0
.../device-xiaomi-ysl/deviceinfo | 0
.../device-xiaomi-ysl/modules-initfs | 0
.../firmware-xiaomi-daisy/APKBUILD | 0
.../firmware-xiaomi-markw/APKBUILD | 0
.../firmware-xiaomi-mido/APKBUILD | 0
.../firmware-xiaomi-onclite/APKBUILD | 0
.../firmware-xiaomi-rosy/APKBUILD | 0
.../firmware-xiaomi-tissot/APKBUILD | 0
.../firmware-xiaomi-vince/APKBUILD | 0
.../firmware-xiaomi-ysl/APKBUILD | 0
.../90-device-xiaomi-daisy.rules | 5 +++++
.../device-qcom-msm8953/APKBUILD | 15 +++++++++++++--
.../device-qcom-msm8953/deviceinfo | 0
.../device-qcom-msm8953/modules-initfs | 0
.../firmware-qcom-msm8953/APKBUILD | 0
39 files changed, 19 insertions(+), 2 deletions(-)
rename device/{community => archived}/device-xiaomi-daisy/90-device-xiaomi-daisy.rules (100%)
rename device/{community => archived}/device-xiaomi-daisy/APKBUILD (100%)
rename device/{community => archived}/device-xiaomi-daisy/deviceinfo (100%)
rename device/{community => archived}/device-xiaomi-daisy/modules-initfs (100%)
rename device/{community => archived}/device-xiaomi-markw/APKBUILD (100%)
rename device/{community => archived}/device-xiaomi-markw/deviceinfo (100%)
rename device/{community => archived}/device-xiaomi-markw/modules-initfs (100%)
rename device/{community => archived}/device-xiaomi-mido/APKBUILD (100%)
rename device/{community => archived}/device-xiaomi-mido/deviceinfo (100%)
rename device/{community => archived}/device-xiaomi-mido/modules-initfs (100%)
rename device/{testing => archived}/device-xiaomi-onclite/APKBUILD (100%)
rename device/{testing => archived}/device-xiaomi-onclite/deviceinfo (100%)
rename device/{testing => archived}/device-xiaomi-onclite/modules-initfs (100%)
rename device/{testing => archived}/device-xiaomi-rosy/APKBUILD (100%)
rename device/{testing => archived}/device-xiaomi-rosy/deviceinfo (100%)
rename device/{testing => archived}/device-xiaomi-rosy/modules-initfs (100%)
rename device/{community => archived}/device-xiaomi-tissot/APKBUILD (100%)
rename device/{community => archived}/device-xiaomi-tissot/deviceinfo (100%)
rename device/{community => archived}/device-xiaomi-tissot/modules-initfs (100%)
rename device/{community => archived}/device-xiaomi-vince/APKBUILD (100%)
rename device/{community => archived}/device-xiaomi-vince/deviceinfo (100%)
rename device/{community => archived}/device-xiaomi-vince/modules-initfs (100%)
rename device/{community => archived}/device-xiaomi-ysl/APKBUILD (100%)
rename device/{community => archived}/device-xiaomi-ysl/deviceinfo (100%)
rename device/{community => archived}/device-xiaomi-ysl/modules-initfs (100%)
rename device/{community => archived}/firmware-xiaomi-daisy/APKBUILD (100%)
rename device/{community => archived}/firmware-xiaomi-markw/APKBUILD (100%)
rename device/{community => archived}/firmware-xiaomi-mido/APKBUILD (100%)
rename device/{testing => archived}/firmware-xiaomi-onclite/APKBUILD (100%)
rename device/{testing => archived}/firmware-xiaomi-rosy/APKBUILD (100%)
rename device/{community => archived}/firmware-xiaomi-tissot/APKBUILD (100%)
rename device/{community => archived}/firmware-xiaomi-vince/APKBUILD (100%)
rename device/{community => archived}/firmware-xiaomi-ysl/APKBUILD (100%)
create mode 100644 device/community/device-qcom-msm8953/90-device-xiaomi-daisy.rules
rename device/{testing => community}/device-qcom-msm8953/APKBUILD (60%)
rename device/{testing => community}/device-qcom-msm8953/deviceinfo (100%)
rename device/{testing => community}/device-qcom-msm8953/modules-initfs (100%)
rename device/{testing => community}/firmware-qcom-msm8953/APKBUILD (100%)
diff --git a/CODEOWNERS b/CODEOWNERS
index c5bdf74d817..e552ddb4e2d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -31,6 +31,7 @@ device/*/*-pine64-pinephonepro/ @PsychoGame
device/*/*-pine64-rockpro64/ @PureTryOut
device/*/*-purism-librem5/ @craftyguy @alistair23 @Newbyte
device/*/*-qcom-msm8916/ @Minecrell @TravMurav
+device/*/*-qcom-msm8953/ @barni2000 @alikates @vipaoL @jiaxyga
device/*/*-qcom-sdm670/ @flamingradian
device/*/*-qcom-sdm845/ @sdm845-mainline
device/*/*-qcom-sm6350/ @z3ntu
diff --git a/device/community/device-xiaomi-daisy/90-device-xiaomi-daisy.rules b/device/archived/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
similarity index 100%
rename from device/community/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
rename to device/archived/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
diff --git a/device/community/device-xiaomi-daisy/APKBUILD b/device/archived/device-xiaomi-daisy/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-daisy/APKBUILD
rename to device/archived/device-xiaomi-daisy/APKBUILD
diff --git a/device/community/device-xiaomi-daisy/deviceinfo b/device/archived/device-xiaomi-daisy/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-daisy/deviceinfo
rename to device/archived/device-xiaomi-daisy/deviceinfo
diff --git a/device/community/device-xiaomi-daisy/modules-initfs b/device/archived/device-xiaomi-daisy/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-daisy/modules-initfs
rename to device/archived/device-xiaomi-daisy/modules-initfs
diff --git a/device/community/device-xiaomi-markw/APKBUILD b/device/archived/device-xiaomi-markw/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-markw/APKBUILD
rename to device/archived/device-xiaomi-markw/APKBUILD
diff --git a/device/community/device-xiaomi-markw/deviceinfo b/device/archived/device-xiaomi-markw/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-markw/deviceinfo
rename to device/archived/device-xiaomi-markw/deviceinfo
diff --git a/device/community/device-xiaomi-markw/modules-initfs b/device/archived/device-xiaomi-markw/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-markw/modules-initfs
rename to device/archived/device-xiaomi-markw/modules-initfs
diff --git a/device/community/device-xiaomi-mido/APKBUILD b/device/archived/device-xiaomi-mido/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-mido/APKBUILD
rename to device/archived/device-xiaomi-mido/APKBUILD
diff --git a/device/community/device-xiaomi-mido/deviceinfo b/device/archived/device-xiaomi-mido/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-mido/deviceinfo
rename to device/archived/device-xiaomi-mido/deviceinfo
diff --git a/device/community/device-xiaomi-mido/modules-initfs b/device/archived/device-xiaomi-mido/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-mido/modules-initfs
rename to device/archived/device-xiaomi-mido/modules-initfs
diff --git a/device/testing/device-xiaomi-onclite/APKBUILD b/device/archived/device-xiaomi-onclite/APKBUILD
similarity index 100%
rename from device/testing/device-xiaomi-onclite/APKBUILD
rename to device/archived/device-xiaomi-onclite/APKBUILD
diff --git a/device/testing/device-xiaomi-onclite/deviceinfo b/device/archived/device-xiaomi-onclite/deviceinfo
similarity index 100%
rename from device/testing/device-xiaomi-onclite/deviceinfo
rename to device/archived/device-xiaomi-onclite/deviceinfo
diff --git a/device/testing/device-xiaomi-onclite/modules-initfs b/device/archived/device-xiaomi-onclite/modules-initfs
similarity index 100%
rename from device/testing/device-xiaomi-onclite/modules-initfs
rename to device/archived/device-xiaomi-onclite/modules-initfs
diff --git a/device/testing/device-xiaomi-rosy/APKBUILD b/device/archived/device-xiaomi-rosy/APKBUILD
similarity index 100%
rename from device/testing/device-xiaomi-rosy/APKBUILD
rename to device/archived/device-xiaomi-rosy/APKBUILD
diff --git a/device/testing/device-xiaomi-rosy/deviceinfo b/device/archived/device-xiaomi-rosy/deviceinfo
similarity index 100%
rename from device/testing/device-xiaomi-rosy/deviceinfo
rename to device/archived/device-xiaomi-rosy/deviceinfo
diff --git a/device/testing/device-xiaomi-rosy/modules-initfs b/device/archived/device-xiaomi-rosy/modules-initfs
similarity index 100%
rename from device/testing/device-xiaomi-rosy/modules-initfs
rename to device/archived/device-xiaomi-rosy/modules-initfs
diff --git a/device/community/device-xiaomi-tissot/APKBUILD b/device/archived/device-xiaomi-tissot/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-tissot/APKBUILD
rename to device/archived/device-xiaomi-tissot/APKBUILD
diff --git a/device/community/device-xiaomi-tissot/deviceinfo b/device/archived/device-xiaomi-tissot/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-tissot/deviceinfo
rename to device/archived/device-xiaomi-tissot/deviceinfo
diff --git a/device/community/device-xiaomi-tissot/modules-initfs b/device/archived/device-xiaomi-tissot/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-tissot/modules-initfs
rename to device/archived/device-xiaomi-tissot/modules-initfs
diff --git a/device/community/device-xiaomi-vince/APKBUILD b/device/archived/device-xiaomi-vince/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-vince/APKBUILD
rename to device/archived/device-xiaomi-vince/APKBUILD
diff --git a/device/community/device-xiaomi-vince/deviceinfo b/device/archived/device-xiaomi-vince/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-vince/deviceinfo
rename to device/archived/device-xiaomi-vince/deviceinfo
diff --git a/device/community/device-xiaomi-vince/modules-initfs b/device/archived/device-xiaomi-vince/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-vince/modules-initfs
rename to device/archived/device-xiaomi-vince/modules-initfs
diff --git a/device/community/device-xiaomi-ysl/APKBUILD b/device/archived/device-xiaomi-ysl/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-ysl/APKBUILD
rename to device/archived/device-xiaomi-ysl/APKBUILD
diff --git a/device/community/device-xiaomi-ysl/deviceinfo b/device/archived/device-xiaomi-ysl/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-ysl/deviceinfo
rename to device/archived/device-xiaomi-ysl/deviceinfo
diff --git a/device/community/device-xiaomi-ysl/modules-initfs b/device/archived/device-xiaomi-ysl/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-ysl/modules-initfs
rename to device/archived/device-xiaomi-ysl/modules-initfs
diff --git a/device/community/firmware-xiaomi-daisy/APKBUILD b/device/archived/firmware-xiaomi-daisy/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-daisy/APKBUILD
rename to device/archived/firmware-xiaomi-daisy/APKBUILD
diff --git a/device/community/firmware-xiaomi-markw/APKBUILD b/device/archived/firmware-xiaomi-markw/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-markw/APKBUILD
rename to device/archived/firmware-xiaomi-markw/APKBUILD
diff --git a/device/community/firmware-xiaomi-mido/APKBUILD b/device/archived/firmware-xiaomi-mido/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-mido/APKBUILD
rename to device/archived/firmware-xiaomi-mido/APKBUILD
diff --git a/device/testing/firmware-xiaomi-onclite/APKBUILD b/device/archived/firmware-xiaomi-onclite/APKBUILD
similarity index 100%
rename from device/testing/firmware-xiaomi-onclite/APKBUILD
rename to device/archived/firmware-xiaomi-onclite/APKBUILD
diff --git a/device/testing/firmware-xiaomi-rosy/APKBUILD b/device/archived/firmware-xiaomi-rosy/APKBUILD
similarity index 100%
rename from device/testing/firmware-xiaomi-rosy/APKBUILD
rename to device/archived/firmware-xiaomi-rosy/APKBUILD
diff --git a/device/community/firmware-xiaomi-tissot/APKBUILD b/device/archived/firmware-xiaomi-tissot/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-tissot/APKBUILD
rename to device/archived/firmware-xiaomi-tissot/APKBUILD
diff --git a/device/community/firmware-xiaomi-vince/APKBUILD b/device/archived/firmware-xiaomi-vince/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-vince/APKBUILD
rename to device/archived/firmware-xiaomi-vince/APKBUILD
diff --git a/device/community/firmware-xiaomi-ysl/APKBUILD b/device/archived/firmware-xiaomi-ysl/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-ysl/APKBUILD
rename to device/archived/firmware-xiaomi-ysl/APKBUILD
diff --git a/device/community/device-qcom-msm8953/90-device-xiaomi-daisy.rules b/device/community/device-qcom-msm8953/90-device-xiaomi-daisy.rules
new file mode 100644
index 00000000000..561e5ba37e6
--- /dev/null
+++ b/device/community/device-qcom-msm8953/90-device-xiaomi-daisy.rules
@@ -0,0 +1,5 @@
+SUBSYSTEM=="input", ENV{DEVNAME}=="/dev/input/event1", \
+ATTRS{name}=="Goodix Capacitive TouchScreen", \
+ENV{WL_CALIBRATION}="4.00 0.00 0.00 0.00 1.80 0.00", \
+ENV{LIBINPUT_CALIBRATION_MATRIX}="4.00 0.00 0 0.00 1.80 0", \
+ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1"
diff --git a/device/testing/device-qcom-msm8953/APKBUILD b/device/community/device-qcom-msm8953/APKBUILD
similarity index 60%
rename from device/testing/device-qcom-msm8953/APKBUILD
rename to device/community/device-qcom-msm8953/APKBUILD
index 8a4fc1fb1e6..aae5cb27233 100644
--- a/device/testing/device-qcom-msm8953/APKBUILD
+++ b/device/community/device-qcom-msm8953/APKBUILD
@@ -1,9 +1,12 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Co-Maintainer: Alejandro Tafalla <alikates@dnyon.com>
+# Co-Maintainer: Victor Pavlov (vipaoL) <vipaolmail@gmail.com>
+# Co-Maintainer: Danila Tikhonov (JIaxyga) <danila@mainlining.org>
pkgname=device-qcom-msm8953
pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
-pkgver=3
+pkgver=4
pkgrel=0
url="https://postmarketos.org"
license="MIT"
@@ -21,9 +24,11 @@ depends="
soc-qcom-msm8953-modem
"
makedepends="devicepkg-dev"
+subpackages="device-xiaomi-daisy-fake-goodix:xiaomi_daisy_fake_goodix"
source="
deviceinfo
modules-initfs
+ 90-device-xiaomi-daisy.rules
"
build() {
@@ -34,7 +39,13 @@ package() {
devicepkg_package $startdir $pkgname
}
+xiaomi_daisy_fake_goodix() {
+ pkgdesc="Calibration data for replacement goodix touch controllers"
+ install -Dm644 90-device-xiaomi-daisy.rules -t "$subpkgdir/etc/udev/rules.d/"
+}
+
sha512sums="
f5f41dc82c96aac6451f5512a36911706e6ed055f8d70a4acae208d24c527fef5a66f34f645347ffa3d24edaa49961bea1d020cd341b818705fc87050fe9bf61 deviceinfo
70917147c1c49f9419ff8be2a03e38c24ad7730091c53a2182797dde85fd8c2073f71187e8e583774974a1509b634433725543547e528364f41d85e63b2ace85 modules-initfs
+a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145 90-device-xiaomi-daisy.rules
"
diff --git a/device/testing/device-qcom-msm8953/deviceinfo b/device/community/device-qcom-msm8953/deviceinfo
similarity index 100%
rename from device/testing/device-qcom-msm8953/deviceinfo
rename to device/community/device-qcom-msm8953/deviceinfo
diff --git a/device/testing/device-qcom-msm8953/modules-initfs b/device/community/device-qcom-msm8953/modules-initfs
similarity index 100%
rename from device/testing/device-qcom-msm8953/modules-initfs
rename to device/community/device-qcom-msm8953/modules-initfs
diff --git a/device/testing/firmware-qcom-msm8953/APKBUILD b/device/community/firmware-qcom-msm8953/APKBUILD
similarity index 100%
rename from device/testing/firmware-qcom-msm8953/APKBUILD
rename to device/community/firmware-qcom-msm8953/APKBUILD
--
GitLab