Don't use the transition firmware package when building for bullseye

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/' > $@
 

raspi_master.yaml

@@ -71,7 +71,7 @@ steps:
     - dosfstools
     - wireless-tools
     - wpasupplicant
-    - raspi3-firmware
+    - __FIRMWARE_PKG__
     - __LINUX_IMAGE__
     __EXTRA_PKGS__
     tag: /