From 6f016aa1aba263c5c29c15ff70489b85ffbd5280 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.debian@cknow.org>
Date: Fri, 11 Nov 2022 12:50:20 +0100
Subject: [PATCH] Add 'bluez-firmware' package to images

All RPi models which have wireless, also have bluetooth, so add the
firmware package to those images so that the hardware is supported.

Also remove the 'Extra' from the wireless firmware comment.
---
 generate-recipe.py | 9 ++++++++-
 raspi_master.yaml  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/generate-recipe.py b/generate-recipe.py
index c72aee1..65b0f1c 100755
--- a/generate-recipe.py
+++ b/generate-recipe.py
@@ -61,12 +61,18 @@ else:
     firmware_component = 'non-free'
     firmware_component_old = ''
 
-# Extra wireless firmware:
+# wireless firmware:
 if version != '2':
     wireless_firmware = 'firmware-brcm80211'
 else:
     wireless_firmware = ''
 
+# bluetooth firmware:
+if version != '2':
+    bluetooth_firmware = 'bluez-firmware'
+else:
+    bluetooth_firmware = ''
+
 # Pi 4 on buster requires some backports:
 backports_enable = False
 backports_suite = '%s-backports' % suite
@@ -179,6 +185,7 @@ with open('raspi_master.yaml', 'r') as in_file:
             .replace('__SYSTEMD_TIMESYNCD__', systemd_timesyncd) \
             .replace('__RASPI_FIRMWARE__', raspi_firmware) \
             .replace('__WIRELESS_FIRMWARE__', wireless_firmware) \
+            .replace('__BLUETOOTH_FIRMWARE__', bluetooth_firmware) \
             .replace('__SERIAL_CONSOLE__', serial) \
             .replace('__HOST__', hostname) \
             .replace('__TOUCH_MACHINE_ID__', touch_machine_id) \
diff --git a/raspi_master.yaml b/raspi_master.yaml
index 03ba01e..ede0906 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -80,6 +80,7 @@ steps:
     - __LINUX_IMAGE__
     - __RASPI_FIRMWARE__
     - __WIRELESS_FIRMWARE__
+    - __BLUETOOTH_FIRMWARE__
     tag: tag-root
     unless: rootfs_unpacked