Simplify raspi-firmware management.
raspi3-firmware was buster-only.
This commit is contained in:
parent
1b8275894e
commit
5a28d3fe99
|
@ -41,7 +41,6 @@ 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)
|
||||||
raspi_firmware = 'raspi-firmware'
|
|
||||||
fix_firmware = False
|
fix_firmware = False
|
||||||
|
|
||||||
# Bookworm introduced the 'non-free-firmware' component¹; before that,
|
# Bookworm introduced the 'non-free-firmware' component¹; before that,
|
||||||
|
@ -157,7 +156,6 @@ with open('raspi_master.yaml', 'r') as in_file:
|
||||||
.replace('__LINUX_IMAGE__', linux) \
|
.replace('__LINUX_IMAGE__', linux) \
|
||||||
.replace('__DTB__', dtb) \
|
.replace('__DTB__', dtb) \
|
||||||
.replace('__SYSTEMD_TIMESYNCD__', systemd_timesyncd) \
|
.replace('__SYSTEMD_TIMESYNCD__', systemd_timesyncd) \
|
||||||
.replace('__RASPI_FIRMWARE__', raspi_firmware) \
|
|
||||||
.replace('__WIRELESS_FIRMWARE__', wireless_firmware) \
|
.replace('__WIRELESS_FIRMWARE__', wireless_firmware) \
|
||||||
.replace('__BLUETOOTH_FIRMWARE__', bluetooth_firmware) \
|
.replace('__BLUETOOTH_FIRMWARE__', bluetooth_firmware) \
|
||||||
.replace('__SERIAL_CONSOLE__', serial) \
|
.replace('__SERIAL_CONSOLE__', serial) \
|
||||||
|
|
|
@ -79,7 +79,7 @@ steps:
|
||||||
- wpasupplicant
|
- wpasupplicant
|
||||||
- __SYSTEMD_TIMESYNCD__
|
- __SYSTEMD_TIMESYNCD__
|
||||||
- __LINUX_IMAGE__
|
- __LINUX_IMAGE__
|
||||||
- __RASPI_FIRMWARE__
|
- raspi-firmware
|
||||||
- __WIRELESS_FIRMWARE__
|
- __WIRELESS_FIRMWARE__
|
||||||
- __BLUETOOTH_FIRMWARE__
|
- __BLUETOOTH_FIRMWARE__
|
||||||
tag: tag-root
|
tag: tag-root
|
||||||
|
|
Loading…
Reference in New Issue