From 9c134939e0949c15a2bd6262f4d52e437e0e1751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= <duje.mihanovic@skole.hr>
Date: Mon, 1 Jul 2024 14:53:26 +0200
Subject: [PATCH] samsung-coreprimevelte: drop firmware subpackage (MR 5324)

... and install the firmware package using _pmb_recommends instead.

Applied to both downstream and mainline ports.
[ci:skip-build]: already built successfully in CI
---
 .../device-samsung-coreprimevelte-downstream/APKBUILD  | 10 ++--------
 device/testing/device-samsung-coreprimevelte/APKBUILD  | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/device/archived/device-samsung-coreprimevelte-downstream/APKBUILD b/device/archived/device-samsung-coreprimevelte-downstream/APKBUILD
index d4e30add8..67c68d258 100644
--- a/device/archived/device-samsung-coreprimevelte-downstream/APKBUILD
+++ b/device/archived/device-samsung-coreprimevelte-downstream/APKBUILD
@@ -4,14 +4,14 @@
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="mkbootimg linux-samsung-coreprimevelte-downstream postmarketos-base postmarketos-initramfs-minimal pxa-mkbootimg u-boot-tools"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+_pmb_recommends="firmware-samsung-pxa1908-downstream"
 source="deviceinfo 90-coreprimevelte.conf"
 
 build() {
@@ -23,12 +23,6 @@ package() {
 	install -Dm444 $startdir/90-coreprimevelte.conf $pkgdir/etc/sysctl.d/90-coreprimevelte.conf
 }
 
-nonfree_firmware() {
-	pkgdesc="Wi-Fi firmware"
-	depends="firmware-samsung-pxa1908-downstream"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 741f46736c2742d4a6f118a924eee89954fb14e5b1dc00f372bda41b63ec975cf960909f915fcb31ad965f136a712905bc8626cd7e530f40e110885f7c861790  deviceinfo
 4854cc57b86e1199dbc165110514e672dabf45044fe9f7ebbde5b2b24768fb5497273b5f38612cf2dfeffc9bf0648c725114b4fa01165bf7fb02f7d741ee5806  90-coreprimevelte.conf
diff --git a/device/testing/device-samsung-coreprimevelte/APKBUILD b/device/testing/device-samsung-coreprimevelte/APKBUILD
index 90d6fade6..d22154a96 100644
--- a/device/testing/device-samsung-coreprimevelte/APKBUILD
+++ b/device/testing/device-samsung-coreprimevelte/APKBUILD
@@ -2,14 +2,14 @@
 pkgname=device-samsung-coreprimevelte
 pkgdesc="Samsung Galaxy Core Prime VE LTE"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="linux-samsung-coreprimevelte postmarketos-base mkbootimg u-boot-tools pxa-mkbootimg"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+_pmb_recommends="firmware-samsung-pxa1908"
 source="deviceinfo"
 
 build() {
@@ -20,12 +20,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Wi-Fi firmware"
-	depends="firmware-samsung-pxa1908"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 e9ed10e30e09b31f9f4cb148f3d0d2cef252f6c6a40161828d5bc7c8150772746d09e79c4d94614f2e2ce192f135e224cc0a9c61f1bdbd6cde2bc026018744af  deviceinfo
 "