From 8bc2cacd9ff502a483127f5576e070f8cd3c739f Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com>
Date: Sat, 21 Nov 2020 03:35:40 +0300
Subject: [PATCH] device-samsung-klte: several small fixes (MR 1746)

* Mainline kernel: enable installation of Wi-Fi firmware.
  Now that we have Wi-Fi support in mainline kernel, use it.
* Mainline kernel: adjust description of mainline kernel
  subpackage; we still cannot recommend it over downstream,
  but it is not so experimental anymore.
* Downstream kernel: add workaround for broken SSH:
  use dropbear instead of openssh server. See #808
  https://gitlab.com/postmarketOS/pmaports/-/issues/808
---
 device/testing/device-samsung-klte/APKBUILD    | 18 +++++++++++++-----
 ...samsung-klte-kernel-downstream.post-install |  5 +++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/device/testing/device-samsung-klte/APKBUILD b/device/testing/device-samsung-klte/APKBUILD
index d50dcdc71..fba053270 100644
--- a/device/testing/device-samsung-klte/APKBUILD
+++ b/device/testing/device-samsung-klte/APKBUILD
@@ -2,12 +2,15 @@
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5"
 pkgver=0.3
-pkgrel=12
+pkgrel=13
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg"
+depends="
+	mkbootimg
+	postmarketos-base
+	"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
@@ -36,7 +39,12 @@ package() {
 
 kernel_downstream() {
 	pkgdesc="Display, touchscreen, Wi-Fi works (see device table for details)"
-	depends="linux-samsung-klte cpufrequtils msm-fb-refresher"
+	depends="
+		cpufrequtils
+		dropbear
+		linux-samsung-klte
+		msm-fb-refresher
+		"
 	install="$pkgname-kernel-downstream.post-install"
 
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
@@ -59,7 +67,7 @@ kernel_downstream() {
 }
 
 kernel_mainline() {
-	pkgdesc="Close to mainline; for kernel development only (most features aren't working)"
+	pkgdesc="Close to mainline kernel. Display, touchscreen, Wi-Fi works. Work in progress!"
 	depends="linux-postmarketos-qcom-msm8974 mesa-dri-gallium"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
@@ -78,7 +86,7 @@ downstream_firmware() {
 
 mainline_firmware() {
 	pkgdesc="Firmware packages for klte mainline kernel"
-	depends="firmware-adreno"
+	depends="firmware-adreno firmware-samsung-klte"
 	install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 }
diff --git a/device/testing/device-samsung-klte/device-samsung-klte-kernel-downstream.post-install b/device/testing/device-samsung-klte/device-samsung-klte-kernel-downstream.post-install
index 2af011afd..f5d8a6b33 100644
--- a/device/testing/device-samsung-klte/device-samsung-klte-kernel-downstream.post-install
+++ b/device/testing/device-samsung-klte/device-samsung-klte-kernel-downstream.post-install
@@ -8,3 +8,8 @@ rc-update -q add deferred-initcalls sysinit
 if ! grep -q "i wlan0" /etc/conf.d/wpa_supplicant ; then
 	sed -i 's/-Dwext,nl80211/-Dwext,nl80211 -i wlan0/' /etc/conf.d/wpa_supplicant
 fi
+
+# Replace sshd with dropbear (workaround for sshd failure on downstream
+# kernels, see issue #808 https://gitlab.com/postmarketOS/pmaports/-/issues/808 )
+rc-update -q del sshd default
+rc-update -q add dropbear default