From 36ad6638a90b3d42a8134e7a5acc2972432bf7dc Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <cyril@debamax.com>
Date: Tue, 13 Jun 2023 21:02:39 +0200
Subject: [PATCH] Add basic support for trixie.

In passing: the _clean_yaml target should definitely leverage
BUILD_RELEASES instead of duplicating it.
---
 .gitignore         | 5 +++++
 Makefile           | 4 ++--
 README.md          | 2 +-
 generate-recipe.py | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7d18a02..96de792 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,8 @@ raspi_1_bookworm.yaml
 raspi_2_bookworm.yaml
 raspi_3_bookworm.yaml
 raspi_4_bookworm.yaml
+raspi_base_trixie.yaml
+raspi_1_trixie.yaml
+raspi_2_trixie.yaml
+raspi_3_trixie.yaml
+raspi_4_trixie.yaml
diff --git a/Makefile b/Makefile
index bd091d5..75322af 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ all: shasums
 # List all the supported and built Pi platforms here. They get expanded
 # to names like 'raspi_2_buster.yaml' and 'raspi_3_bullseye.img.xz'.
 BUILD_FAMILIES := 1 2 3 4
-BUILD_RELEASES := buster bullseye bookworm
+BUILD_RELEASES := buster bullseye bookworm trixie
 
 platforms := $(foreach plat, $(BUILD_FAMILIES),$(foreach rel, $(BUILD_RELEASES),  raspi_$(plat)_$(rel)))
 
@@ -57,7 +57,7 @@ _ck_root:
 	[ `whoami` = 'root' ] # Only root can summon vmdb2 ☹
 
 _clean_yaml:
-	rm -f $(addsuffix .yaml,$(platforms)) raspi_base_buster.yaml raspi_base_bullseye.yaml raspi_base_bookworm.yaml
+	rm -f $(addsuffix .yaml,$(platforms)) raspi_base_buster.yaml raspi_base_bullseye.yaml raspi_base_bookworm.yaml raspi_base_trixie.yaml
 _clean_images:
 	rm -f $(addsuffix .img,$(platforms))
 _clean_xzimages:
diff --git a/README.md b/README.md
index 7b09d9d..4e8486c 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ The argument to `make` is constructed as follows:
 `raspi_<model>_<release>.<result-type>`
 
 Whereby <model\> is one of `1`, `2`, `3` or `4`, <release\> is either `buster`,
-`bullseye`, or `bookworm`; and <result-type\> is `img` or `yaml`.
+`bullseye`, `bookworm`, or `trixie`; and <result-type\> is `img` or `yaml`.
 
 Model `1` should be used for the Raspberry Pi 0, 0w and 1, models A and
 B. Model `2` for the Raspberry Pi 2 models A and B. Model `3` for all
diff --git a/generate-recipe.py b/generate-recipe.py
index a1e5005..d8b062c 100755
--- a/generate-recipe.py
+++ b/generate-recipe.py
@@ -18,7 +18,7 @@ if version not in ["1", "2", "3", "4"]:
     sys.exit(1)
 
 suite = sys.argv[2]
-if suite not in ['buster', 'bullseye', 'bookworm']:
+if suite not in ['buster', 'bullseye', 'bookworm', 'trixie']:
     print("E: unsupported suite %s" % suite, file=sys.stderr)
     sys.exit(1)
 target_yaml = 'raspi_%s_%s.yaml' % (version, suite)
@@ -54,7 +54,7 @@ else:
 # raspi-firmware was in 'non-free'
 #
 # ¹ https://www.debian.org/vote/2022/vote_003
-if suite == 'bookworm':
+if suite not in ['buster', 'bullseye']:
     firmware_component = 'non-free-firmware'
     firmware_component_old = 'non-free'
 else: