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

Reorder replacements. 

Let's have variables being set and replacements being performed in
roughly the same order.
This commit is contained in:
Cyril Brulebois 2021-08-28 05:30:30 +02:00
parent b339942ca4
commit 2108ed0a80
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
generate-recipe.py
View File

@ -55,12 +55,6 @@ if version != '2':
else: else:
wireless_firmware = '' 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: # Pi 4 on buster requires some backports:
backports_enable = False backports_enable = False
backports_suite = '%s-backports' % suite backports_suite = '%s-backports' % suite
@ -71,6 +65,12 @@ if version == '4' and suite == 'buster':
wireless_firmware = 'firmware-brcm80211/%s' % backports_suite wireless_firmware = 'firmware-brcm80211/%s' % backports_suite
fix_firmware = False fix_firmware = False
# Serial console:
if version in ['1', '2']:
serial = 'ttyAMA0,115200'
elif version in ['3', '4']:
serial = 'ttyS1,115200'
# CMA fixup: # CMA fixup:
extra_chroot_shell_cmds = [] extra_chroot_shell_cmds = []
if version == '4': if version == '4':
@ -140,14 +140,14 @@ with open('raspi_master.yaml', 'r') as in_file:
in_text = in_file.read() in_text = in_file.read()
out_text = in_text \ out_text = in_text \
.replace('__RELEASE__', suite) \ .replace('__RELEASE__', suite) \
.replace('__ARCH__', arch) \
.replace('__LINUX_IMAGE__', linux) \
.replace('__DTB__', dtb) \
.replace('__SECURITY_SUITE__', security_suite) \ .replace('__SECURITY_SUITE__', security_suite) \
.replace('__RASPI_FIRMWARE__', raspi_firmware) \ .replace('__RASPI_FIRMWARE__', raspi_firmware) \
.replace('__WIRELESS_FIRMWARE__', wireless_firmware) \ .replace('__WIRELESS_FIRMWARE__', wireless_firmware) \
.replace('__SERIAL_CONSOLE__', serial) \ .replace('__SERIAL_CONSOLE__', serial) \
.replace('__LINUX_IMAGE__', linux) \ .replace('__HOST__', hostname)
.replace('__DTB__', dtb) \
.replace('__HOST__', hostname) \
.replace('__ARCH__', arch)
out_text = align_replace(out_text, '__FIX_FIRMWARE_PKG_NAME__', fix_firmware_cmds) 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_ROOT_SHELL_CMDS__', extra_root_shell_cmds)