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

Simplify security suite management. 

All supported suites (bullseye+) are using the new naming scheme.
This commit is contained in:
Cyril Brulebois 2023-06-13 21:16:29 +02:00
parent d43ee7b1b8
commit 1b8275894e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generate-recipe.py
View File

@ -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)
security_suite = '%s-security' % suite
raspi_firmware = 'raspi-firmware' raspi_firmware = 'raspi-firmware'
fix_firmware = False fix_firmware = False
@ -157,7 +156,6 @@ with open('raspi_master.yaml', 'r') as in_file:
.replace('__FIRMWARE_COMPONENT_OLD__', firmware_component_old) \ .replace('__FIRMWARE_COMPONENT_OLD__', firmware_component_old) \
.replace('__LINUX_IMAGE__', linux) \ .replace('__LINUX_IMAGE__', linux) \
.replace('__DTB__', dtb) \ .replace('__DTB__', dtb) \
.replace('__SECURITY_SUITE__', security_suite) \
.replace('__SYSTEMD_TIMESYNCD__', systemd_timesyncd) \ .replace('__SYSTEMD_TIMESYNCD__', systemd_timesyncd) \
.replace('__RASPI_FIRMWARE__', raspi_firmware) \ .replace('__RASPI_FIRMWARE__', raspi_firmware) \
.replace('__WIRELESS_FIRMWARE__', wireless_firmware) \ .replace('__WIRELESS_FIRMWARE__', wireless_firmware) \

2
raspi_master.yaml
View File

@ -54,7 +54,7 @@ steps:
contents: |+ contents: |+
deb http://deb.debian.org/debian __RELEASE__ main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__ deb http://deb.debian.org/debian __RELEASE__ main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__
deb http://deb.debian.org/debian __RELEASE__-updates main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__ deb http://deb.debian.org/debian __RELEASE__-updates main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__
deb http://security.debian.org/debian-security __SECURITY_SUITE__ main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__ deb http://security.debian.org/debian-security __RELEASE__-security main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__
__BACKPORTS__ __BACKPORTS__
unless: rootfs_unpacked unless: rootfs_unpacked