From 5a28d3fe997cbf52818b74ebe2e7fb5c8eb03632 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <cyril@debamax.com>
Date: Tue, 13 Jun 2023 21:18:00 +0200
Subject: [PATCH] Simplify raspi-firmware management.

raspi3-firmware was buster-only.
---
 generate-recipe.py | 2 --
 raspi_master.yaml  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/generate-recipe.py b/generate-recipe.py
index 278c6ca..7256675 100755
--- a/generate-recipe.py
+++ b/generate-recipe.py
@@ -41,7 +41,6 @@ elif version in ['3', '4']:
     dtb = '/usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb'
 
 # APT and default firmware (name + handling)
-raspi_firmware = 'raspi-firmware'
 fix_firmware = False
 
 # Bookworm introduced the 'non-free-firmware' component¹; before that,
@@ -157,7 +156,6 @@ with open('raspi_master.yaml', 'r') as in_file:
             .replace('__LINUX_IMAGE__', linux) \
             .replace('__DTB__', dtb) \
             .replace('__SYSTEMD_TIMESYNCD__', systemd_timesyncd) \
-            .replace('__RASPI_FIRMWARE__', raspi_firmware) \
             .replace('__WIRELESS_FIRMWARE__', wireless_firmware) \
             .replace('__BLUETOOTH_FIRMWARE__', bluetooth_firmware) \
             .replace('__SERIAL_CONSOLE__', serial) \
diff --git a/raspi_master.yaml b/raspi_master.yaml
index 3638486..1bf7779 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -79,7 +79,7 @@ steps:
       - wpasupplicant
       - __SYSTEMD_TIMESYNCD__
       - __LINUX_IMAGE__
-      - __RASPI_FIRMWARE__
+      - raspi-firmware
       - __WIRELESS_FIRMWARE__
       - __BLUETOOTH_FIRMWARE__
     tag: tag-root