From dc7558eb3f30335449e971f52838ec7b2a0dd97d Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.debian@cknow.org>
Date: Mon, 31 Oct 2022 01:04:23 +0100
Subject: [PATCH] Re-add 'non-free' to sources till all firmware is moved

The wireless firmware is in the firmware-brcm80211 package, but that is
still in 'non-free', so add 'non-free' back to the sources until all
the needed firmware packages are in 'non-free-firmware'.

https://salsa.debian.org/kernel-team/firmware-nonfree/-/merge_requests/36
is where the move to non-free-firmware is proposed, but not yet merged.
---
 generate-recipe.py | 3 +++
 raspi_master.yaml  | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/generate-recipe.py b/generate-recipe.py
index 5f24df2..c72aee1 100755
--- a/generate-recipe.py
+++ b/generate-recipe.py
@@ -56,8 +56,10 @@ else:
 # ¹ https://www.debian.org/vote/2022/vote_003
 if suite == 'bookworm':
     firmware_component = 'non-free-firmware'
+    firmware_component_old = 'non-free'
 else:
     firmware_component = 'non-free'
+    firmware_component_old = ''
 
 # Extra wireless firmware:
 if version != '2':
@@ -170,6 +172,7 @@ with open('raspi_master.yaml', 'r') as in_file:
             .replace('__RELEASE__', suite) \
             .replace('__ARCH__', arch) \
             .replace('__FIRMWARE_COMPONENT__', firmware_component) \
+            .replace('__FIRMWARE_COMPONENT_OLD__', firmware_component_old) \
             .replace('__LINUX_IMAGE__', linux) \
             .replace('__DTB__', dtb) \
             .replace('__SECURITY_SUITE__', security_suite) \
diff --git a/raspi_master.yaml b/raspi_master.yaml
index 290a476..8973b23 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -46,12 +46,13 @@ steps:
     components:
     - main
     - __FIRMWARE_COMPONENT__
+    - __FIRMWARE_COMPONENT_OLD__
     unless: rootfs_unpacked
 
   - create-file: /etc/apt/sources.list
     contents: |+
-      deb http://deb.debian.org/debian __RELEASE__ main __FIRMWARE_COMPONENT__
-      deb http://security.debian.org/debian-security __SECURITY_SUITE__ main __FIRMWARE_COMPONENT__
+      deb http://deb.debian.org/debian __RELEASE__ main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__
+      deb http://security.debian.org/debian-security __SECURITY_SUITE__ main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__
       __BACKPORTS__
 
     unless: rootfs_unpacked