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

Add buildtime to raspi-image-id in the image itself 

When the image was build also determines which package versions got
installed in the generated image and could help explain why a user has
problems with the downloaded image.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
This commit is contained in:
Diederik de Haas 2022-01-14 00:19:57 +01:00
parent afe64f3b1f
commit 1211f8af04
No known key found for this signature in database
GPG Key ID: D76E5BCE787EDB6E
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
generate-recipe.py
View File

@ -130,6 +130,7 @@ else:
systemd_timesyncd = 'systemd-timesyncd' systemd_timesyncd = 'systemd-timesyncd'
gitcommit = subprocess.getoutput("git show -s --pretty='format:%C(auto)%h (%s, %ad)' --date=short ") gitcommit = subprocess.getoutput("git show -s --pretty='format:%C(auto)%h (%s, %ad)' --date=short ")
buildtime = subprocess.getoutput("date --utc +'%Y-%m-%d %H:%M'")
### Write results: ### Write results:
@ -167,7 +168,8 @@ with open('raspi_master.yaml', 'r') as in_file:
.replace('__SERIAL_CONSOLE__', serial) \ .replace('__SERIAL_CONSOLE__', serial) \
.replace('__HOST__', hostname) \ .replace('__HOST__', hostname) \
.replace('__TOUCH_MACHINE_ID__', touch_machine_id) \ .replace('__TOUCH_MACHINE_ID__', touch_machine_id) \
.replace('__GITCOMMIT__', gitcommit) .replace('__GITCOMMIT__', gitcommit) \
.replace('__BUILDTIME__', buildtime)
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)

2
raspi_master.yaml
View File

@ -175,4 +175,4 @@ steps:
# Create /etc/raspi-image-id to know, from what commit the image was built # Create /etc/raspi-image-id to know, from what commit the image was built
- chroot: / - chroot: /
shell: | shell: |
echo "image based on revision: __GITCOMMIT__ " > "/etc/raspi-image-id" echo "image based on revision: __GITCOMMIT__ and build on __BUILDTIME__ (UTC)" > "/etc/raspi-image-id"