From 89ef8242851a201426c4df36efa89aa43646a06a Mon Sep 17 00:00:00 2001
From: Gunnar Wolf <gwolf@gwolf.org>
Date: Mon, 25 Jan 2021 14:27:26 -0600
Subject: [PATCH] Don't use the transition firmware package when building for
 bullseye

---
 Makefile          | 2 ++
 raspi_master.yaml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 65cd69a..60269f2 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ yaml: $(addsuffix .yaml,$(platforms))
 
 raspi_base_buster.yaml: raspi_master.yaml
 	cat raspi_master.yaml | \
+	sed "s/__FIRMWARE_PKG__/raspi3-firmware" | \
 	sed "s/__RELEASE__/buster/" > $@
 
 raspi_1_buster.yaml: raspi_base_buster.yaml
@@ -54,6 +55,7 @@ raspi_4_buster.yaml: raspi_base_buster.yaml
 raspi_base_bullseye.yaml: raspi_master.yaml
 	cat raspi_master.yaml | \
 	sed "s/__RELEASE__/bullseye/" |\
+	sed "s/__FIRMWARE_PKG__/raspi-firmware/" | \
 	grep -v "__OTHER_APT_ENABLE__" |\
 	sed -e '/debian-security/ s/deb/# Uncomment after Bullseye becomes stable → deb/' > $@
 
diff --git a/raspi_master.yaml b/raspi_master.yaml
index 77befcb..8d6e9bf 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -71,7 +71,7 @@ steps:
     - dosfstools
     - wireless-tools
     - wpasupplicant
-    - raspi3-firmware
+    - __FIRMWARE_PKG__
     - __LINUX_IMAGE__
     __EXTRA_PKGS__
     tag: /