From 74be63253987f1f9d6c0b6db76ffc4032e04da8c Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <cyril@debamax.com>
Date: Tue, 13 Jun 2023 21:19:49 +0200
Subject: [PATCH] Delete raspi3-firmware tweaks.

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

diff --git a/generate-recipe.py b/generate-recipe.py
index 7256675..1af8c1f 100755
--- a/generate-recipe.py
+++ b/generate-recipe.py
@@ -40,9 +40,6 @@ elif version in ['3', '4']:
     linux = 'linux-image-arm64'
     dtb = '/usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb'
 
-# APT and default firmware (name + handling)
-fix_firmware = False
-
 # Bookworm introduced the 'non-free-firmware' component¹; before that,
 # raspi-firmware was in 'non-free'
 #
@@ -95,12 +92,6 @@ extra_root_shell_cmds = []
 
 ### The following prepares substitutions based on variables set earlier
 
-# Commands to fix the firmware name in the systemd unit:
-if fix_firmware:
-    fix_firmware_cmds = ['sed -i s/raspi-firmware/raspi3-firmware/ ${ROOT?}/etc/systemd/system/rpi-reconfigure-raspi-firmware.service']
-else:
-    fix_firmware_cmds = []
-
 # Enable backports with a reason, or add commented-out entry:
 if backports_enable:
     backports_stanza = """
@@ -164,7 +155,6 @@ with open('raspi_master.yaml', 'r') as in_file:
             .replace('__GITCOMMIT__', gitcommit) \
             .replace('__BUILDTIME__', buildtime)
 
-        out_text = align_replace(out_text, '__FIX_FIRMWARE_PKG_NAME__', fix_firmware_cmds)
         out_text = align_replace(out_text, '__EXTRA_ROOT_SHELL_CMDS__', extra_root_shell_cmds)
         out_text = align_replace(out_text, '__EXTRA_CHROOT_SHELL_CMDS__', extra_chroot_shell_cmds)
         out_text = align_replace(out_text, '__BACKPORTS__', backports_stanza.splitlines())
diff --git a/raspi_master.yaml b/raspi_master.yaml
index 1bf7779..f723c89 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -112,7 +112,6 @@ steps:
       install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-reconfigure-raspi-firmware.service "${ROOT?}/etc/systemd/system/"
       mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/"
       ln -s /etc/systemd/system/rpi-reconfigure-raspi-firmware.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-reconfigure-raspi-firmware.service"
-      __FIX_FIRMWARE_PKG_NAME__
 
       install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/"
       ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-generate-ssh-host-keys.service"