d71140b08a
Previous commit not only replaced 'non-free' with 'non-free-firmware',
it also removed the 'contrib' archive area from the sources.list.
It added a note about it in the code comments, which I think is the
wrong place. The 'why' of a change belongs in a git commit message,
where one can be as verbose as needed.
Code comments should be used to clarify the 'what' (it does) in case it
would not be immediately obvious.
The removal of 'contrib' totally makes sense though.
We did not use it and 'contrib' and 'non-free' are not part of
(official) Debian, whereas 'non-free-firmware' is now part of Debian
(official media) as a consequence of the change to the Debian Social
Contract following the GR vote.
With this change, we only use what Debian itself would only use.
Fixes: 1ffce8e6bb
196 lines
6.2 KiB
Python
Executable File
196 lines
6.2 KiB
Python
Executable File
#!/usr/bin/python3
|
|
|
|
import re
|
|
import sys
|
|
import subprocess
|
|
|
|
# pylint: disable=invalid-name
|
|
|
|
### Sanity/usage checks
|
|
|
|
if len(sys.argv) != 3:
|
|
print("E: need 2 arguments", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
version = sys.argv[1]
|
|
if version not in ["1", "2", "3", "4"]:
|
|
print("E: unsupported version %s" % version, file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
suite = sys.argv[2]
|
|
if suite not in ['buster', 'bullseye', 'bookworm']:
|
|
print("E: unsupported suite %s" % suite, file=sys.stderr)
|
|
sys.exit(1)
|
|
target_yaml = 'raspi_%s_%s.yaml' % (version, suite)
|
|
|
|
|
|
### Setting variables based on suite and version starts here
|
|
|
|
# Arch, kernel, DTB:
|
|
if version == '1':
|
|
arch = 'armel'
|
|
linux = 'linux-image-rpi'
|
|
dtb = '/usr/lib/linux-image-*-rpi/bcm*rpi-*.dtb'
|
|
elif version == '2':
|
|
arch = 'armhf'
|
|
linux = 'linux-image-armmp'
|
|
dtb = '/usr/lib/linux-image-*-armmp/bcm*rpi*.dtb'
|
|
elif version in ['3', '4']:
|
|
arch = 'arm64'
|
|
linux = 'linux-image-arm64'
|
|
dtb = '/usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb'
|
|
|
|
# APT and default firmware (name + handling)
|
|
if suite == 'buster':
|
|
security_suite = '%s/updates' % suite
|
|
raspi_firmware = 'raspi3-firmware'
|
|
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,
|
|
# raspi-firmware was in 'non-free'
|
|
#
|
|
# ¹ https://www.debian.org/vote/2022/vote_003
|
|
if suite == 'bookworm':
|
|
firmware_component = 'non-free-firmware'
|
|
else:
|
|
firmware_component = 'non-free'
|
|
|
|
# Extra wireless firmware:
|
|
if version != '2':
|
|
wireless_firmware = 'firmware-brcm80211'
|
|
else:
|
|
wireless_firmware = ''
|
|
|
|
# Pi 4 on buster requires some backports:
|
|
backports_enable = False
|
|
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:
|
|
if version in ['1', '2']:
|
|
serial = 'ttyAMA0,115200'
|
|
elif version in ['3', '4']:
|
|
serial = 'ttyS1,115200'
|
|
|
|
# CMA fixup:
|
|
extra_chroot_shell_cmds = []
|
|
if version == '4':
|
|
extra_chroot_shell_cmds = [
|
|
"sed -i 's/cma=64M //' /boot/firmware/cmdline.txt",
|
|
]
|
|
|
|
# XXX: The disparity between suite seems to be a bug, pick a naming
|
|
# and stick to it!
|
|
#
|
|
# Hostname:
|
|
if suite == 'buster':
|
|
hostname = 'rpi%s' % version
|
|
else:
|
|
hostname = 'rpi_%s' % version
|
|
|
|
# Nothing yet!
|
|
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 = """
|
|
%s
|
|
deb http://deb.debian.org/debian/ %s main %s
|
|
""" % (backports_enable, backports_suite, firmware_component)
|
|
else:
|
|
# ugh
|
|
backports_stanza = """
|
|
# Backports are _not_ enabled by default.
|
|
# Enable them by uncommenting the following line:
|
|
# deb http://deb.debian.org/debian %s main %s
|
|
""" % (backports_suite, firmware_component)
|
|
|
|
# Buster requires an existing, empty /etc/machine-id file:
|
|
if suite == 'buster':
|
|
touch_machine_id = 'touch /etc/machine-id'
|
|
else:
|
|
touch_machine_id = ''
|
|
|
|
# Buster shipped timesyncd directly into systemd:
|
|
if suite == 'buster':
|
|
systemd_timesyncd = 'systemd'
|
|
else:
|
|
systemd_timesyncd = 'systemd-timesyncd'
|
|
|
|
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'")
|
|
|
|
### Write results:
|
|
|
|
def align_replace(text, pattern, replacement):
|
|
"""
|
|
This helper lets us keep the indentation of the matched pattern
|
|
with the upcoming replacement, across multiple lines. Naive
|
|
implementation, please make it more pythonic!
|
|
"""
|
|
lines = text.splitlines()
|
|
for i, line in enumerate(lines):
|
|
m = re.match(r'^(\s+)%s' % pattern, line)
|
|
if m:
|
|
indent = m.group(1)
|
|
del lines[i]
|
|
for r in replacement:
|
|
lines.insert(i, '%s%s' % (indent, r))
|
|
i = i + 1
|
|
break
|
|
return '\n'. join(lines) + '\n'
|
|
|
|
|
|
with open('raspi_master.yaml', 'r') as in_file:
|
|
with open(target_yaml, 'w') as out_file:
|
|
in_text = in_file.read()
|
|
out_text = in_text \
|
|
.replace('__RELEASE__', suite) \
|
|
.replace('__ARCH__', arch) \
|
|
.replace('__FIRMWARE_COMPONENT__', firmware_component) \
|
|
.replace('__LINUX_IMAGE__', linux) \
|
|
.replace('__DTB__', dtb) \
|
|
.replace('__SECURITY_SUITE__', security_suite) \
|
|
.replace('__SYSTEMD_TIMESYNCD__', systemd_timesyncd) \
|
|
.replace('__RASPI_FIRMWARE__', raspi_firmware) \
|
|
.replace('__WIRELESS_FIRMWARE__', wireless_firmware) \
|
|
.replace('__SERIAL_CONSOLE__', serial) \
|
|
.replace('__HOST__', hostname) \
|
|
.replace('__TOUCH_MACHINE_ID__', touch_machine_id) \
|
|
.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())
|
|
|
|
# Try not to keep lines where the placeholder was replaced
|
|
# with nothing at all (including on a "list item" line):
|
|
filtered = [x for x in out_text.splitlines()
|
|
if not re.match(r'^\s+$', x)
|
|
and not re.match(r'^\s+-\s*$', x)]
|
|
out_file.write('\n'.join(filtered) + "\n")
|