forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fairphone-fp2: reorganize dependencies, install modem firmware by default (!686)

Browse source 
The modem boots up properly without causing any problems, so let's
install the firmware and support packages by default.

Also install adsp-audio now by default to boot up the adsp for audio and
other services provided by the processor.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Luca Weiss 2019-10-15 20:17:39 +02:00 • committed by Oliver Smith
parent ce8bded1e9
commit bd67629606
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
device/device-fairphone-fp2/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname="device-fairphone-fp2"
pkgdesc="Fairphone 2"
pkgver=2
pkgrel=3
pkgrel=4
url="https://postmarketos.org"
license="MIT"
arch="armv7"
@ -24,11 +24,14 @@ package() {
nonfree_firmware() {
pkgdesc="Firmware for WiFi, Audio, etc."
depends="firmware-fairphone-fp2-adsp firmware-fairphone-fp2-wcnss $pkgname-alsa"
depends="$pkgname-alsa firmware-fairphone-fp2-modem firmware-fairphone-fp2-wcnss"
mkdir "$subpkgdir"
}
alsa() {
pkgdesc="Audio configuration files"
depends="firmware-fairphone-fp2-adsp"
mkdir -p "$subpkgdir"/usr/share/alsa/ucm/FP2
install -Dm644 "$srcdir"/FP2.conf "$subpkgdir"/usr/share/alsa/ucm/FP2/
install -Dm644 "$srcdir"/hifi "$subpkgdir"/usr/share/alsa/ucm/FP2/

19
firmware/firmware-fairphone-fp2/APKBUILD
View file

@ -1,17 +1,18 @@
pkgname=firmware-fairphone-fp2
pkgver=17.09.3
pkgrel=1
pkgrel=2
pkgdesc="Firmware for Fairphone 2"
subpackages="$pkgname-wcnss $pkgname-adsp $pkgname-modem"
url="https://github.com/FairBlobs/firmware"
url="https://github.com/FairBlobs/FP2-firmware"
arch="armv7"
license="proprietary"
options="!check !strip !archcheck"
builddir="$srcdir/FP2-firmware-$pkgver"
# Sources
_commit="6785087409c73b046d11a5c88225d4177e172a1d"
_wififiles="WCNSS_cfg.dat WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin"
source="$pkgname-$pkgver.tar.gz::https://github.com/FairBlobs/firmware/archive/$pkgver.tar.gz"
source="$pkgname-$pkgver.tar.gz::https://github.com/FairBlobs/FP2-firmware/archive/$pkgver.tar.gz"
for _i in $_wififiles; do
source="$source $pkgname-$_commit-$_i::https://raw.githubusercontent.com/LineageOS/android_device_fairphone_FP2/$_commit/wifi/$_i";
done
@ -25,7 +26,7 @@ wcnss() {
pkgdesc="Fairphone 2 firmware for the Qualcomm Wireless Connectivity Subsystem (WCNSS)"
depends="wcnss-wlan"
cd "$srcdir/firmware-$pkgver"
cd "$builddir"
for _i in wcnss.*; do
install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
done
@ -37,7 +38,9 @@ wcnss() {
adsp() {
pkgdesc="Fairphone 2 adsp firmware"
cd "$srcdir/firmware-$pkgver"
depends="adsp-audio"
cd "$builddir"
for _i in adsp.*; do
install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
done
@ -45,13 +48,15 @@ adsp() {
modem() {
pkgdesc="Fairphone 2 modem firmware"
cd "$srcdir/firmware-$pkgver"
depends="modem-qcom-msm-downstream-common"
cd "$builddir"
for _i in modem.* mba.*; do
install -Dm644 $_i "$subpkgdir"/lib/firmware/postmarketos/$_i
done
}
sha512sums="c7101c0a7477acc04938294e915643fdc3e0d40c6ffab11abb89ae24fee52b0778ae6463668d3b91f8630de96203e4e916a268f4384600c4190e22d638d6a9eb firmware-fairphone-fp2-17.09.3.tar.gz
sha512sums="f4af05a78e58b6f178903823a2bc2d4198dcb37b3a543aaa9fda21683757f880440ca2b138f37f61aafaf197cfad7b729e27f37e26cbd965fb4a772b42a8a881 firmware-fairphone-fp2-17.09.3.tar.gz
619df454e0dc65ab62894b7f328c015729e8261919032ee9096bb4f983ddd6f7b98dd14f593b4c6b75cf86c09f090a9cde7674f4c8197cda927a2ac47111cd2e firmware-fairphone-fp2-6785087409c73b046d11a5c88225d4177e172a1d-WCNSS_cfg.dat
50625167fd5d3de8b834327a518714299972de3bd3077cb10d4317fb8135b52eb2f0d89f696f48e0530ac8d7a20e76ad01e30ebabec405ef241dc8b1cd52d94c firmware-fairphone-fp2-6785087409c73b046d11a5c88225d4177e172a1d-WCNSS_qcom_cfg.ini
d29aaefa6e42bd4a2146b79ee0f0fb6698dae34978bf9bebee9cfa96795c0329be1f7e896cf707f121dab35872d4ce9540b3c79c43bdfd98c75c16d2d875ab3c firmware-fairphone-fp2-6785087409c73b046d11a5c88225d4177e172a1d-WCNSS_qcom_wlan_nv.bin"