From 2eb1a1dc2fce44903e9d5300aa19424e73d4b7b7 Mon Sep 17 00:00:00 2001
From: Arnav Singh <me@arnavion.dev>
Date: Mon, 4 Mar 2024 12:44:29 -0800
Subject: [PATCH] device-google-x64cros: remove nonfree-firmware subpackages
 (MR 4887)

They were used to install `oem-{amd,intel}-nonfree-firmware` but they had been
merged into `oem-{amd,intel}` by c6306cb9bbbf3bcb654f05b140e45960d9cdfb30
---
 .../community/device-google-x64cros/APKBUILD  | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/device/community/device-google-x64cros/APKBUILD b/device/community/device-google-x64cros/APKBUILD
index ea67e1a94..82ec44041 100644
--- a/device/community/device-google-x64cros/APKBUILD
+++ b/device/community/device-google-x64cros/APKBUILD
@@ -5,7 +5,7 @@
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
 pkgver=7
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -22,9 +22,6 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
 	$pkgname-kernel-lts:kernel_lts
 	$pkgname-kernel-edge:kernel_edge
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-amd:nonfree_firmware_amd
-	$pkgname-nonfree-firmware-intel:nonfree_firmware_intel
 	"
 source="deviceinfo modules-initfs"
 _pmb_recommends="
@@ -52,26 +49,6 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Firmware for x86_64 devices"
-
-	mkdir -p "$subpkgdir"
-}
-
-nonfree_firmware_amd() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel oem-amd"
-	depends="oem-amd-nonfree-firmware"
-
-	mkdir -p "$subpkgdir"
-}
-
-nonfree_firmware_intel() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel oem-intel"
-	depends="oem-intel-nonfree-firmware"
-
-	mkdir -p "$subpkgdir"
-}
-
 sha512sums="
 9260fe8df64e284f137f77844562d2f08e28d72d36a50772b0216cd7d68eeb41d0cdb650d0f0d1ad04c3906991aba0561c36813a2beb62cedf16f616c9ccedb9  deviceinfo
 1b3bbfcdc6642488304653aef996dddf7a354e7279f2c735ac7aec404e598948423630fcaa2cac87e2c0aef033ecfc57a7a91154f9dac9a85411db7bad62e677  modules-initfs