From 1ff589c0a29a56925943d6dd4111700fd279d135 Mon Sep 17 00:00:00 2001
From: Ultracoolguy <dummyd241@gmail.com>
Date: Tue, 8 Sep 2020 13:38:52 -0400
Subject: [PATCH] firmware-motorola-ocean: Add additional blobs (MR 1558)
firmware-motorola-ocean: Change package() syntax
Also add linux-firmware-qcom dependency
---
device/testing/device-motorola-ocean/APKBUILD | 4 ++--
.../testing/firmware-motorola-ocean/APKBUILD | 20 ++++++++++++-------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/device/testing/device-motorola-ocean/APKBUILD b/device/testing/device-motorola-ocean/APKBUILD
index 13d0351a6de..4be72f7d8a0 100644
--- a/device/testing/device-motorola-ocean/APKBUILD
+++ b/device/testing/device-motorola-ocean/APKBUILD
@@ -3,7 +3,7 @@
pkgname=device-motorola-ocean
pkgdesc="Motorola Moto G7 Power"
pkgver=0.1
-pkgrel=0
+pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
@@ -34,7 +34,7 @@ kernel_mainline() {
}
nonfree_firmware() {
- pkgdesc="Wifi and video firmware"
+ pkgdesc="Wifi and GPU firmware"
depends="firmware-motorola-ocean"
mkdir "$subpkgdir"
}
diff --git a/device/testing/firmware-motorola-ocean/APKBUILD b/device/testing/firmware-motorola-ocean/APKBUILD
index 890d2a3b16e..f379a9df98b 100644
--- a/device/testing/firmware-motorola-ocean/APKBUILD
+++ b/device/testing/firmware-motorola-ocean/APKBUILD
@@ -1,22 +1,28 @@
pkgname=firmware-motorola-ocean
pkgver=1
-pkgrel=0
+pkgrel=1
pkgdesc="Firmware for Motorola Moto G7 Power"
url="https://gitlab.com/Ultracoolguy/firmware-motorola-ocean"
arch="aarch64"
license="proprietary"
options="!check !strip !archcheck"
-depends="wcnss-wlan"
-_commit="8ac6914c1e6559016db55981d575d6034413b286"
+depends="linux-firmware-qcom"
+_commit="1d0aa3d90c6984bf2f2774e4fbebcfbfaf2b6d69"
source="https://gitlab.com/Ultracoolguy/firmware-motorola-ocean/-/archive/$_commit/firmware-motorola-ocean-$_commit.tar.gz"
+
builddir="$srcdir/$pkgname-$_commit"
_fwdir="/lib/firmware/postmarketos"
package() {
- install -Dm644 "$builddir"/wcnss.* -t "$pkgdir/$_fwdir"
- install -Dm644 "$builddir"/wlan/prima/WCNSS_* -t "$pkgdir/$_fwdir"/wlan/prima
- install -Dm644 "$builddir"/venus.* -t "$pkgdir/$_fwdir"
+ install -Dm644 "$builddir"/wcnss.* -t \
+ "$pkgdir/$_fwdir"
+ install -Dm644 "$builddir"/wlan/prima/WCNSS_* -t \
+ "$pkgdir/$_fwdir"/wlan/prima
+ install -Dm644 "$builddir"/venus.* -t \
+ "$pkgdir/$_fwdir"
+ install -Dm644 "$builddir"/a506_zap.* -t \
+ "$pkgdir/$_fwdir"
}
-sha512sums="b382c3497dfac931c346d7a680e4144229d56584a6dbd3b7ceeca6083730608c774980a1a7db51834b4b7206c6ade8f2200c37373ffc2a92c8407b5a0e20b030 firmware-motorola-ocean-8ac6914c1e6559016db55981d575d6034413b286.tar.gz"
+sha512sums="a926564f45a199ecb3f5f86da1ad84d80e2d1b772d7c072f018374ff51956442686fa375c8b3f3fc0745fac59277c7504e2dd653aa86cc141e207fba1ff39c7e firmware-motorola-ocean-1d0aa3d90c6984bf2f2774e4fbebcfbfaf2b6d69.tar.gz"
--
GitLab