a7y18lte-pmos/pmos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device-samsung-klte: several small fixes (MR 1746)

Browse Source 
* 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
This commit is contained in:
Alexey Min 2020-11-21 03:35:40 +03:00 committed by Bart Ribbers
parent 915d11748a
commit 8bc2cacd9f
No known key found for this signature in database
GPG Key ID: 699D16185DAFAE61
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
device/testing/device-samsung-klte/APKBUILD
View File

@ -2,12 +2,15 @@
pkgname=device-samsung-klte pkgname=device-samsung-klte
pkgdesc="Samsung Galaxy S5" pkgdesc="Samsung Galaxy S5"
pkgver=0.3 pkgver=0.3
pkgrel=12 pkgrel=13
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="armv7" arch="armv7"
options="!check !archcheck" options="!check !archcheck"
depends="postmarketos-base mkbootimg" depends="
mkbootimg
postmarketos-base
"
makedepends="devicepkg-dev" makedepends="devicepkg-dev"
subpackages=" subpackages="
$pkgname-kernel-downstream:kernel_downstream $pkgname-kernel-downstream:kernel_downstream
@ -36,7 +39,12 @@ package() {
kernel_downstream() { kernel_downstream() {
pkgdesc="Display, touchscreen, Wi-Fi works (see device table for details)" 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" install="$pkgname-kernel-downstream.post-install"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
@ -59,7 +67,7 @@ kernel_downstream() {
} }
kernel_mainline() { 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" depends="linux-postmarketos-qcom-msm8974 mesa-dri-gallium"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
} }
@ -78,7 +86,7 @@ downstream_firmware() {
mainline_firmware() { mainline_firmware() {
pkgdesc="Firmware packages for klte mainline kernel" pkgdesc="Firmware packages for klte mainline kernel"
depends="firmware-adreno" depends="firmware-adreno firmware-samsung-klte"
install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware" install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

5
device/testing/device-samsung-klte/device-samsung-klte-kernel-downstream.post-install
View File

@ -8,3 +8,8 @@ rc-update -q add deferred-initcalls sysinit
if ! grep -q "i wlan0" /etc/conf.d/wpa_supplicant ; then 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 sed -i 's/-Dwext,nl80211/-Dwext,nl80211 -i wlan0/' /etc/conf.d/wpa_supplicant
fi 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