From 2108ed0a80315a9699c96d4793897997bde4adde Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sat, 28 Aug 2021 05:30:30 +0200 Subject: [PATCH] Reorder replacements. Let's have variables being set and replacements being performed in roughly the same order. --- generate-recipe.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/generate-recipe.py b/generate-recipe.py index 7e2caac..17d2239 100755 --- a/generate-recipe.py +++ b/generate-recipe.py @@ -55,12 +55,6 @@ if version != '2': else: wireless_firmware = '' -# Serial console: -if version in ['1', '2']: - serial = 'ttyAMA0,115200' -elif version in ['3', '4']: - serial = 'ttyS1,115200' - # Pi 4 on buster requires some backports: backports_enable = False backports_suite = '%s-backports' % suite @@ -71,6 +65,12 @@ if version == '4' and suite == 'buster': wireless_firmware = 'firmware-brcm80211/%s' % backports_suite fix_firmware = False +# 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': @@ -140,14 +140,14 @@ with open('raspi_master.yaml', 'r') as in_file: in_text = in_file.read() out_text = in_text \ .replace('__RELEASE__', suite) \ + .replace('__ARCH__', arch) \ + .replace('__LINUX_IMAGE__', linux) \ + .replace('__DTB__', dtb) \ .replace('__SECURITY_SUITE__', security_suite) \ .replace('__RASPI_FIRMWARE__', raspi_firmware) \ .replace('__WIRELESS_FIRMWARE__', wireless_firmware) \ .replace('__SERIAL_CONSOLE__', serial) \ - .replace('__LINUX_IMAGE__', linux) \ - .replace('__DTB__', dtb) \ - .replace('__HOST__', hostname) \ - .replace('__ARCH__', arch) + .replace('__HOST__', hostname) 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)