From 1b8275894e3e6516be7f18185372ea8e955b613f Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Tue, 13 Jun 2023 21:16:29 +0200 Subject: [PATCH] Simplify security suite management. All supported suites (bullseye+) are using the new naming scheme. --- generate-recipe.py | 2 -- raspi_master.yaml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/generate-recipe.py b/generate-recipe.py index 61226f1..278c6ca 100755 --- a/generate-recipe.py +++ b/generate-recipe.py @@ -41,7 +41,6 @@ elif version in ['3', '4']: dtb = '/usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb' # APT and default firmware (name + handling) -security_suite = '%s-security' % suite raspi_firmware = 'raspi-firmware' fix_firmware = False @@ -157,7 +156,6 @@ with open('raspi_master.yaml', 'r') as in_file: .replace('__FIRMWARE_COMPONENT_OLD__', firmware_component_old) \ .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) \ diff --git a/raspi_master.yaml b/raspi_master.yaml index ba80d83..3638486 100644 --- a/raspi_master.yaml +++ b/raspi_master.yaml @@ -54,7 +54,7 @@ steps: contents: |+ 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://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__ unless: rootfs_unpacked