From 7ef84a37fcbca0352936337a34a047d502ef223a Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Fri, 9 Apr 2021 00:27:54 +0100 Subject: [PATCH] firmware-oneplus-sdm845: add firmware to initramfs (MR 2088) Add a subpackage to ensure that GPU firmware is included in initramfs so that osk-sdl can work. [ci:skip-vercheck] Signed-off-by: Caleb Connolly --- .../30-gpu-firmware.files | 3 +++ .../firmware-oneplus-sdm845/APKBUILD | 20 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 device/community/firmware-oneplus-sdm845/30-gpu-firmware.files diff --git a/device/community/firmware-oneplus-sdm845/30-gpu-firmware.files b/device/community/firmware-oneplus-sdm845/30-gpu-firmware.files new file mode 100644 index 000000000..1e7a72ca7 --- /dev/null +++ b/device/community/firmware-oneplus-sdm845/30-gpu-firmware.files @@ -0,0 +1,3 @@ +/lib/firmware/qcom/a630_gmu.bin +/lib/firmware/qcom/a630_sqe.fw +/lib/firmware/qcom/sdm845/oneplus6/a630_zap.mbn diff --git a/device/community/firmware-oneplus-sdm845/APKBUILD b/device/community/firmware-oneplus-sdm845/APKBUILD index 4e96be3d2..fb3d30f60 100644 --- a/device/community/firmware-oneplus-sdm845/APKBUILD +++ b/device/community/firmware-oneplus-sdm845/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Caleb Connolly pkgname=firmware-oneplus-sdm845 -pkgver=2 +pkgver=3 pkgrel=0 pkgdesc="Firmware for OnePlus 6 / 6T" url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845" @@ -13,7 +13,10 @@ options="!check !strip !archcheck" _version="08f4058de46f2c09a3ba0f232b79a2d7bce53628" source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz -firmware.files" + firmware.files + 30-gpu-firmware.files" +subpackages=" + $pkgname-initramfs:firmware_initramfs" package() { cd "$srcdir/$pkgname-$_version/" @@ -24,5 +27,16 @@ package() { done < "$srcdir/firmware.files" } +firmware_initramfs() { + pkgdesc="Files to be included in the initramfs to support osk-sdl" + depends="$pkgname" + install_if="$pkgname-nonfree-firmware" + mkdir "$subpkgdir" + + install -Dm644 "$srcdir/30-gpu-firmware.files" \ + "$subpkgdir/etc/postmarketos-mkinitfs/files/30-gpu-firmware.files" +} + sha512sums="5ede4c192e14a55766fbb5c1351beda470fb87cecc372cc624a465fbcfd14d0b07d313c7e0d7b05df88c11f9113bbae987d3502aba2b9ddc6940c839fcf4335c firmware-oneplus-sdm845.tar.gz -7a5c40a95b5225a9fca1833c8e75cda804ee4a81bc6efa4603680f681018531ebdcdb83be356c8ddb3c1143cd67a47430fb1cec1d4896202d95006caeffd2a2a firmware.files" +7a5c40a95b5225a9fca1833c8e75cda804ee4a81bc6efa4603680f681018531ebdcdb83be356c8ddb3c1143cd67a47430fb1cec1d4896202d95006caeffd2a2a firmware.files +bc6c329bf6bb9622320ab610f4f5fb944129e276855a4cf5646cb29a553f4c47cd9a4ef4305cbcd94a991471bc109b8f615cefd6871be99bf6a457fe0fa5aa19 30-gpu-firmware.files"