Delete support for buster.

Bookworm was just released, bullseye is now oldstable, and buster is now
oldoldstable. It doesn't seem to be worth it to keep building images for
it, so let's drop support for it right away.
This commit is contained in:
Cyril Brulebois 2023-06-13 21:09:45 +02:00
parent 36ad6638a9
commit d43ee7b1b8
4 changed files with 11 additions and 40 deletions

5
.gitignore vendored
View File

@ -5,11 +5,6 @@ raspi*.img.xz
raspi*.log raspi*.log
raspi*.tar.gz raspi*.tar.gz
raspi*.sha256 raspi*.sha256
raspi_base_buster.yaml
raspi_1_buster.yaml
raspi_2_buster.yaml
raspi_3_buster.yaml
raspi_4_buster.yaml
raspi_base_bullseye.yaml raspi_base_bullseye.yaml
raspi_1_bullseye.yaml raspi_1_bullseye.yaml
raspi_2_bullseye.yaml raspi_2_bullseye.yaml

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 trixie BUILD_RELEASES := 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 raspi_base_trixie.yaml rm -f $(addsuffix .yaml,$(platforms)) 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:

View File

@ -58,7 +58,7 @@ you'll need to execute `make` as root.
The argument to `make` is constructed as follows: 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
`bullseye`, `bookworm`, or `trixie`; 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

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', 'trixie']: if suite not in ['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)
@ -41,20 +41,15 @@ elif version in ['3', '4']:
dtb = '/usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb' dtb = '/usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb'
# APT and default firmware (name + handling) # APT and default firmware (name + handling)
if suite == 'buster': security_suite = '%s-security' % suite
security_suite = '%s/updates' % suite raspi_firmware = 'raspi-firmware'
raspi_firmware = 'raspi3-firmware' fix_firmware = False
fix_firmware = True
else:
security_suite = '%s-security' % suite
raspi_firmware = 'raspi-firmware'
fix_firmware = False
# Bookworm introduced the 'non-free-firmware' component¹; before that, # Bookworm introduced the 'non-free-firmware' component¹; before that,
# 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 not in ['buster', 'bullseye']: if suite != 'bullseye':
firmware_component = 'non-free-firmware' firmware_component = 'non-free-firmware'
firmware_component_old = 'non-free' firmware_component_old = 'non-free'
else: else:
@ -76,16 +71,6 @@ else:
# Pi 4 on buster requires some backports: # Pi 4 on buster requires some backports:
backports_enable = False backports_enable = False
backports_suite = '%s-backports' % suite backports_suite = '%s-backports' % suite
if version == '4' and suite == 'buster':
backports_enable = "# raspi 4 needs kernel and firmware newer than buster's"
linux = '%s/%s' % (linux, backports_suite)
raspi_firmware = 'raspi-firmware/%s' % backports_suite
wireless_firmware = 'firmware-brcm80211/%s' % backports_suite
fix_firmware = False
if version == '3' and suite == 'buster':
backports_enable = "# raspi 3 needs firmware-brcm80211 newer than buster's for wifi"
wireless_firmware = 'firmware-brcm80211/%s' % backports_suite
# Serial console: # Serial console:
if version in ['1', '2']: if version in ['1', '2']:
@ -104,10 +89,7 @@ if version == '4':
# and stick to it! # and stick to it!
# #
# Hostname: # Hostname:
if suite == 'buster': hostname = 'rpi_%s' % version
hostname = 'rpi%s' % version
else:
hostname = 'rpi_%s' % version
# Nothing yet! # Nothing yet!
extra_root_shell_cmds = [] extra_root_shell_cmds = []
@ -136,16 +118,10 @@ else:
""" % (backports_suite, firmware_component) """ % (backports_suite, firmware_component)
# Buster requires an existing, empty /etc/machine-id file: # Buster requires an existing, empty /etc/machine-id file:
if suite == 'buster': touch_machine_id = 'echo "uninitialized" > /etc/machine-id'
touch_machine_id = 'touch /etc/machine-id'
else:
touch_machine_id = 'echo "uninitialized" > /etc/machine-id'
# Buster shipped timesyncd directly into systemd: # Buster shipped timesyncd directly into systemd:
if suite == 'buster': systemd_timesyncd = 'systemd-timesyncd'
systemd_timesyncd = 'systemd'
else:
systemd_timesyncd = 'systemd-timesyncd'
gitcommit = subprocess.getoutput("git show -s --pretty='format:%C(auto)%h (%s, %ad)' --date=short ") gitcommit = subprocess.getoutput("git show -s --pretty='format:%C(auto)%h (%s, %ad)' --date=short ")
buildtime = subprocess.getoutput("date --utc +'%Y-%m-%d %H:%M'") buildtime = subprocess.getoutput("date --utc +'%Y-%m-%d %H:%M'")