From 54d42e22bea587db5693aade8cd43f14d37fc3d8 Mon Sep 17 00:00:00 2001 From: Petr Hodina <phodina@protonmail.com> Date: Mon, 3 Jul 2023 20:27:46 +0200 Subject: [PATCH] device-pine64-pinenote: add dependency on linux-firmware (MR 4142) firmware-pine64-pinenote: remove Wifi and Bluetooth drivers [ci:skip-build]: Already built successfully in CI --- device/testing/device-pine64-pinenote/APKBUILD | 4 ++-- device/testing/firmware-pine64-pinenote/APKBUILD | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/device/testing/device-pine64-pinenote/APKBUILD b/device/testing/device-pine64-pinenote/APKBUILD index 5d230a74e45..0a9205fe44f 100644 --- a/device/testing/device-pine64-pinenote/APKBUILD +++ b/device/testing/device-pine64-pinenote/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-pine64-pinenote pkgdesc="Pine64 PineNote" pkgver=1 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -58,7 +58,7 @@ phosh() { nonfree_firmware() { pkgdesc="WiFi, Bluetooth and display firmware" - depends="firmware-pine64-pinenote" + depends="firmware-pine64-pinenote linux-firmware" mkdir "$subpkgdir" } diff --git a/device/testing/firmware-pine64-pinenote/APKBUILD b/device/testing/firmware-pine64-pinenote/APKBUILD index 0f7cf28421a..94c5ed82b62 100644 --- a/device/testing/firmware-pine64-pinenote/APKBUILD +++ b/device/testing/firmware-pine64-pinenote/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Petr Hodina <phodina@protonmail.com> pkgname=firmware-pine64-pinenote pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="Firmware for Pine64 Pinenote" url="https://gitlab.com/calebccff/firmware-pine64-pinenote" arch="aarch64" @@ -19,10 +19,6 @@ package() { "$pkgdir/usr/share/mkinitfs/files/30-eink-waveform.files" install -Dm644 waveform.bin "$pkgdir"/lib/firmware/rockchip/ebc.wbf - install -Dm644 brcm/BCM4345C0_cy.hcd "$pkgdir"/lib/firmware/brcm/BCM4345C0_cy.hcd - install -Dm644 brcm/BCM4345C0.hcd "$pkgdir"/lib/firmware/brcm/BCM4345C0.hcd - install -Dm644 brcm/fw_bcm43455c0_ag_cy.bin "$pkgdir"/lib/firmware/brcm/brcmfmac43455-sdio.bin - install -Dm644 brcm/nvram_ap6255_cy.txt "$pkgdir"/lib/firmware/brcm/brcmfmac43455-sdio.txt } sha512sums=" -- GitLab