From 9f36519cf1271b8d3756cfb44aa212706e78c4e8 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Thu, 23 Jun 2022 18:44:48 +0200
Subject: [PATCH] sony-leo: clean up device package (MR 3250)

Add flash method fastboot so we can actually flash it with pmbootstrap,
remove outdated 90-android-touch-dev.rules and improve the formatting
throughout the APKBUILD.

[ci:skip-build] already built successfully in CI
---
 .../90-android-touch-dev.rules                |  5 ----
 device/testing/device-sony-leo/APKBUILD       | 24 ++++++++++---------
 device/testing/device-sony-leo/deviceinfo     |  1 +
 3 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 device/testing/device-sony-leo/90-android-touch-dev.rules

diff --git a/device/testing/device-sony-leo/90-android-touch-dev.rules b/device/testing/device-sony-leo/90-android-touch-dev.rules
deleted file mode 100644
index af079af5f..000000000
--- a/device/testing/device-sony-leo/90-android-touch-dev.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# use 'weston-calibrator' to calibrate the touchscreen!
-SUBSYSTEM=="input", ATTRS{name}=="clearpad", \
-ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1" \
-ENV{WL_CALIBRATION}="0.982113 -0.006129 1.983124 -0.002560 1.000800 -6.012451"
-
diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD
index 21e4f7f0d..eeb76ee24 100644
--- a/device/testing/device-sony-leo/APKBUILD
+++ b/device/testing/device-sony-leo/APKBUILD
@@ -2,20 +2,24 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
-pkgver=0.1
-pkgrel=5
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg mesa-dri-gallium msm-fb-refresher"
+depends="
+	mesa-dri-gallium
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-kernel-downstream:kernel_downstream
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-nonfree-firmware:nonfree_firmware
 	"
-source="deviceinfo
-	90-android-touch-dev.rules
-	"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -23,8 +27,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
 kernel_downstream() {
@@ -38,7 +40,7 @@ nonfree_firmware() {
 	depends="firmware-sony-leo"
 	mkdir "$subpkgdir"
 }
+
 sha512sums="
-b2c228e32c9b1c9fbfaa6c95c2fc5566fe042fd8143ea25fce702f940c0549c7e9b5fd6ab392809ec55ec94773ac5d396b635d9af9ab84dff0584053096c9da8  deviceinfo
-0fbbc5ef5b303431a0f1a9b9ef939f03aef6f1774765089102ce95e57dc5edb692c685a6c11adcada40db608998b714029d12a05c9364bd0445ce8fda7bf5fde  90-android-touch-dev.rules
+e03ad1d4cb45929b1f3401c5d4b09e2c2c8b5a770f5adeecd7f0403af25e401d3e18dd72585a0069c82ba80c029fe692538c1ffafcfbbf63027d280c6bb87cca  deviceinfo
 "
diff --git a/device/testing/device-sony-leo/deviceinfo b/device/testing/device-sony-leo/deviceinfo
index 9d173698e..eb96e8672 100644
--- a/device/testing/device-sony-leo/deviceinfo
+++ b/device/testing/device-sony-leo/deviceinfo
@@ -16,6 +16,7 @@ deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
 
 # Bootloader related
+deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x37 ehci-hcd.park=3 dwc3.maximum_speed=high dwc3_msm.prop_chg_detect=Y vmalloc=300M buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"