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

fairphone-fp2: reorganize dependencies (again), add mainline subpackage (!692)

Browse source 
Remove all firmware-support dependencies from the firmware package and
add them to -downstream-firmware and -mainline-firmware packages which
have an install_if on the downstream or mainline kernel subpackage.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Luca Weiss 2019-10-19 21:57:59 +02:00 committed by Oliver Smith
parent d4f39c5a44
commit 1d966578d2
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 45 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,17 +2,24 @@
pkgname="device-fairphone-fp2"
pkgdesc="Fairphone 2"
pkgver=2
pkgrel=4
pkgrel=5
url="https://postmarketos.org"
license="MIT"
arch="armv7"
options="!check !archcheck"
depends="postmarketos-base linux-fairphone-fp2 mkbootimg mesa-dri-swrast"
depends="postmarketos-base mkbootimg"
makedepends="devicepkg-dev"
source="deviceinfo
FP2.conf
hifi"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-alsa"
subpackages="
$pkgname-kernel-downstream:kernel_downstream
$pkgname-kernel-mainline:kernel_mainline
$pkgname-nonfree-firmware:nonfree_firmware
$pkgname-downstream-firmware:downstream_firmware
$pkgname-mainline-firmware:mainline_firmware
$pkgname-alsa
"
build() {
devicepkg_build $startdir $pkgname
@ -22,21 +29,46 @@ package() {
devicepkg_package $startdir $pkgname
}
kernel_downstream() {
pkgdesc="Downstream kernel"
depends="linux-fairphone-fp2 mesa-dri-swrast ofono"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}
kernel_mainline() {
pkgdesc="Mainline kernel"
depends="linux-postmarketos-qcom-msm8974 mesa-dri-freedreno"
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}
nonfree_firmware() {
pkgdesc="Firmware for WiFi, Audio, etc."
depends="$pkgname-alsa firmware-fairphone-fp2-modem firmware-fairphone-fp2-wcnss"
depends="firmware-fairphone-fp2-adsp firmware-fairphone-fp2-modem firmware-fairphone-fp2-wcnss"
mkdir "$subpkgdir"
}
downstream_firmware() {
pkgdesc="Firmware support packages for downstream kernel"
depends="$pkgname-alsa adsp-audio modem-qcom-msm-downstream-common wcnss-wlan"
install_if="$pkgname-kernel-downstream $pkgname-nonfree-firmware"
mkdir "$subpkgdir"
}
mainline_firmware() {
pkgdesc="Firmware support packages for mainline kernel"
depends="modem-qcom-msm-mainline-common firmware-adreno"
install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
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/
}
sha512sums="c20d8601def1e45df617f87159e336b8a9a8189bbc73b8112291a60ff6246d432549af9d1fb838252665b8be92aed97fc2afcba1736b59565458e50ae097f5fb deviceinfo
sha512sums="43f05596cd1e2759f9b182777211c3ec879fcd1be7d7f1ff94b409c85847ba2715fdf3080c95af5a5b28c35c7e6460cd149208b0291cc54b47a2e6a834096db3 deviceinfo
55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f FP2.conf
b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1 hifi"

10
device/device-fairphone-fp2/deviceinfo
View file

@ -6,7 +6,8 @@ deviceinfo_name="Fairphone 2"
deviceinfo_manufacturer="Fairphone"
deviceinfo_codename="fairphone-fp2"
deviceinfo_date=""
deviceinfo_dtb=""
deviceinfo_dtb_mainline="qcom-msm8974-fairphone-fp2"
deviceinfo_append_dtb_mainline="true"
deviceinfo_modules_initfs=""
deviceinfo_arch="armv7"
@ -21,12 +22,13 @@ deviceinfo_dev_keyboard=""
# Bootloader related
deviceinfo_flash_method="fastboot"
deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0xf991e000 PMOS_NO_OUTPUT_REDIRECT clk_ignore_unused pd_ignore_unused cma=300m msm.vram=200m"
deviceinfo_generate_bootimg="true"
deviceinfo_bootimg_qcdt="true"
deviceinfo_bootimg_qcdt_downstream="true"
deviceinfo_flash_offset_base="0x00000000"
deviceinfo_flash_offset_kernel="0x00008000"
deviceinfo_flash_offset_ramdisk="0x01000000"
deviceinfo_flash_offset_ramdisk="0x02000000"
deviceinfo_flash_offset_second="0x00f00000"
deviceinfo_flash_offset_tags="0x00000100"
deviceinfo_flash_pagesize="2048"

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

@ -1,6 +1,6 @@
pkgname=firmware-fairphone-fp2
pkgver=17.09.3
pkgrel=2
pkgrel=3
pkgdesc="Firmware for Fairphone 2"
subpackages="$pkgname-wcnss $pkgname-adsp $pkgname-modem"
url="https://github.com/FairBlobs/FP2-firmware"
@ -24,7 +24,6 @@ package() {
wcnss() {
pkgdesc="Fairphone 2 firmware for the Qualcomm Wireless Connectivity Subsystem (WCNSS)"
depends="wcnss-wlan"
cd "$builddir"
for _i in wcnss.*; do
@ -38,7 +37,6 @@ wcnss() {
adsp() {
pkgdesc="Fairphone 2 adsp firmware"
depends="adsp-audio"
cd "$builddir"
for _i in adsp.*; do
@ -48,7 +46,6 @@ adsp() {
modem() {
pkgdesc="Fairphone 2 modem firmware"
depends="modem-qcom-msm-downstream-common"
cd "$builddir"
for _i in modem.* mba.*; do