Hibbian
/
Raspi-image-spec
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Add basic support for trixie. 

In passing: the _clean_yaml target should definitely leverage
BUILD_RELEASES instead of duplicating it.
This commit is contained in:
Cyril Brulebois 2023-06-13 21:02:39 +02:00
parent cfce727f4b
commit 36ad6638a9
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -20,3 +20,8 @@ raspi_1_bookworm.yaml
raspi_2_bookworm.yaml raspi_2_bookworm.yaml
raspi_3_bookworm.yaml raspi_3_bookworm.yaml
raspi_4_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

4
Makefile
View File

@ -3,7 +3,7 @@ all: shasums
# List all the supported and built Pi platforms here. They get expanded # 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'. # to names like 'raspi_2_buster.yaml' and 'raspi_3_bullseye.img.xz'.
BUILD_FAMILIES := 1 2 3 4 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))) 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 ☹ [ `whoami` = 'root' ] # Only root can summon vmdb2 ☹
_clean_yaml: _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: _clean_images:
rm -f $(addsuffix .img,$(platforms)) rm -f $(addsuffix .img,$(platforms))
_clean_xzimages: _clean_xzimages:

2
README.md
View File

@ -59,7 +59,7 @@ The argument to `make` is constructed as follows:
`raspi_<model>_<release>.<result-type>` `raspi_<model>_<release>.<result-type>`
Whereby <model\> is one of `1`, `2`, `3` or `4`, <release\> is either `buster`, 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 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 B. Model `2` for the Raspberry Pi 2 models A and B. Model `3` for all

4
generate-recipe.py
View File

@ -18,7 +18,7 @@ if version not in ["1", "2", "3", "4"]:
sys.exit(1) sys.exit(1)
suite = sys.argv[2] 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) print("E: unsupported suite %s" % suite, file=sys.stderr)
sys.exit(1) sys.exit(1)
target_yaml = 'raspi_%s_%s.yaml' % (version, suite) target_yaml = 'raspi_%s_%s.yaml' % (version, suite)
@ -54,7 +54,7 @@ else:
# raspi-firmware was in 'non-free' # raspi-firmware was in 'non-free'
# #
# ¹ https://www.debian.org/vote/2022/vote_003 # ¹ https://www.debian.org/vote/2022/vote_003
if suite == 'bookworm': if suite not in ['buster', 'bullseye']:
firmware_component = 'non-free-firmware' firmware_component = 'non-free-firmware'
firmware_component_old = 'non-free' firmware_component_old = 'non-free'
else: else: