From 4ce7075d673a0301fa10642e49bca0c4af2b36ed Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Sat, 4 May 2019 15:58:26 +0200
Subject: [PATCH] fairphone-fp1: fix touchscreen and display (!343)

Install msm-fb-refresher, it's needed for the screen to refresh.
Update the kernel to a new commit with several patches applied to fix
the touchscreen - before it wasn't working properly.
Switch architecture from armhf to armv7.

[ci:skip-build]: already built successfully in CI
---
 device/device-fairphone-fp1/APKBUILD          |  8 ++++----
 device/device-fairphone-fp1/deviceinfo        |  2 +-
 device/linux-fairphone-fp1/APKBUILD           | 19 ++++++++++---------
 ...e-fp1.armhf => config-fairphone-fp1.armv7} |  0
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename device/linux-fairphone-fp1/{config-fairphone-fp1.armhf => config-fairphone-fp1.armv7} (100%)

diff --git a/device/device-fairphone-fp1/APKBUILD b/device/device-fairphone-fp1/APKBUILD
index f445aecff..dc9b078cc 100644
--- a/device/device-fairphone-fp1/APKBUILD
+++ b/device/device-fairphone-fp1/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-fairphone-fp1"
 pkgdesc="FP1"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-fairphone-fp1 mkbootimg mtk-mkimage mesa-dri-swrast"
+depends="postmarketos-base linux-fairphone-fp1 mkbootimg mtk-mkimage mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
@@ -19,4 +19,4 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="bac3491b0850d1d2c4769581cb5d6e45ee4b67bdac2daa7555b20862e47cfdbc95ddadb92e7a1b3f6daa3b561a19116e666e10902c33ca3e2b1de26e77e4289a  deviceinfo"
+sha512sums="378d4d20308e441f42f4e4fcd1341d7955e11a773935d81bc431f05cf06c9aa25b1b45c7cbe578a58258606e511d9074947e823a2a0725eafa04d292550ded18  deviceinfo"
diff --git a/device/device-fairphone-fp1/deviceinfo b/device/device-fairphone-fp1/deviceinfo
index 191b70071..38b9880cf 100644
--- a/device/device-fairphone-fp1/deviceinfo
+++ b/device/device-fairphone-fp1/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="fairphone-fp1"
 deviceinfo_date=""
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"
diff --git a/device/linux-fairphone-fp1/APKBUILD b/device/linux-fairphone-fp1/APKBUILD
index 6b7b14805..842255f8c 100644
--- a/device/linux-fairphone-fp1/APKBUILD
+++ b/device/linux-fairphone-fp1/APKBUILD
@@ -3,9 +3,9 @@
 
 pkgname="linux-fairphone-fp1"
 pkgver=3.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Fairphone 1 kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="fairphone-fp1"
 url="https://kernel.org"
@@ -22,20 +22,21 @@ fi
 
 # Source
 _repository="android_kernel_fairphone_FP1"
-_commit="f1a2a1f0b862cb96c669881cd31ba7729e31d90f"
+_commit="328160cf6ddec4ad417cdf648b61d26cc09f9e73"
 _config="config-${_flavor}.${arch}"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/z3ntu/${_repository}/archive/${_commit}.tar.gz
 	$_config
 "
-builddir="$srcdir/${_repository}-${_commit}/kernel"
+builddir="$srcdir/${_repository}-${_commit}"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	downstreamkernel_prepare "$srcdir" "$builddir"/kernel "$_config" "$_carch" "$HOSTCC"
 }
 
 build() {
+	cd "$builddir"/kernel
 	unset LDFLAGS
 	TARGET_BUILD_VARIANT=user TARGET_PRODUCT=ahong89_wet_jb2 \
 		make ARCH="$_carch" CC="${CC:-gcc}" \
@@ -44,15 +45,15 @@ build() {
 
 package() {
 	# kernel.release
-	install -D "$builddir/include/config/kernel.release" \
+	install -D "$builddir/kernel/include/config/kernel.release" \
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 
-	cd "$builddir/arch/$_carch/boot"
+	cd "$builddir/kernel/arch/$_carch/boot"
 	# Add mediatek header to zImage
 	mtk-mkimage KERNEL zImage zImage-mtk
 	# Install modified zImage
 	install -Dm644 zImage-mtk "$pkgdir/boot/vmlinuz-$_flavor"
 }
 
-sha512sums="00f02c71ed097ba40530c000df24539234fab110d08477578ed31bd6f6c92cff2d48611e01dccba6cb54aaf83b0739df27c9684112eb7d89e21a47e538b56b8b  linux-fairphone-fp1-f1a2a1f0b862cb96c669881cd31ba7729e31d90f.tar.gz
-425d550de5aca702e269b30f2e4e9104757ade36bc9a307c023089dcb14e294a37a720070b39eb42b4ffbab4154624d40f2c883f624abc99cf08ac9670027222  config-fairphone-fp1.armhf"
+sha512sums="9ab967c0635dc5b3dca457725d25b44cfc391cb8fb5b9417fe5d6636131aecdf36575375f6151496d5269aaaf14cf15a4580aaee6a4699f0644822af66efba06  linux-fairphone-fp1-328160cf6ddec4ad417cdf648b61d26cc09f9e73.tar.gz
+425d550de5aca702e269b30f2e4e9104757ade36bc9a307c023089dcb14e294a37a720070b39eb42b4ffbab4154624d40f2c883f624abc99cf08ac9670027222  config-fairphone-fp1.armv7"
diff --git a/device/linux-fairphone-fp1/config-fairphone-fp1.armhf b/device/linux-fairphone-fp1/config-fairphone-fp1.armv7
similarity index 100%
rename from device/linux-fairphone-fp1/config-fairphone-fp1.armhf
rename to device/linux-fairphone-fp1/config-fairphone-fp1.armv7