From 5fb3d0a42b2e61201294123758440e3f4bd8844b Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 9 Oct 2023 07:33:04 +0200 Subject: [PATCH] firmware-fairphone-fp4: remove a630_sqe.fw from adreno subpackage (MR 4463) Due to symlinks from linux-firmware-ath10k apk is now pulling in linux-firmware-qcom which already provides a630_sqe.fw. Since this file is not device/vendor-specific we can really use the file from linux-firmware and not provide our own. For the record, a619_gmu.bin also shouldn't be device-specific but currently linux-firmware doesn't provide that one. Also just pulling linux-firmware-qcom for this tiny file is pretty space inefficient but due to the symlink dependency mentioned above, just removing this file for now from the firmware package removes the file conflict reported by apk: ERROR: linux-firmware-qcom-20230919-r1: trying to overwrite lib/firmware/qcom/a630_sqe.fw owned by firmware-fairphone-fp4-adreno-20230215-r1. [luca: update commit message to reflect dependency situation, update packaging code a bit] --- device/community/firmware-fairphone-fp4/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device/community/firmware-fairphone-fp4/APKBUILD b/device/community/firmware-fairphone-fp4/APKBUILD index 04037ba48..3ec2b242f 100644 --- a/device/community/firmware-fairphone-fp4/APKBUILD +++ b/device/community/firmware-fairphone-fp4/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-fairphone-fp4 pkgver=20230215 -pkgrel=1 +pkgrel=2 pkgdesc="Firmware for Fairphone 4" subpackages=" $pkgname-adreno @@ -28,7 +28,7 @@ package() { adreno() { pkgdesc="Fairphone 4 adreno firmware" - install -Dm644 "$builddir"/a6* -t \ + install -Dm644 "$builddir"/a615_zap* "$builddir"/a619_gmu.bin -t \ "$subpkgdir/lib/firmware/qcom/" }