From afe64f3b1f2ddae523b82d277f58ac79f3b0a78d Mon Sep 17 00:00:00 2001
From: Anton Gladky <gladk@debian.org>
Date: Sat, 1 Jan 2022 23:37:27 +0100
Subject: [PATCH] Add git commit information into the image. Fixes #43

---
 generate-recipe.py | 5 ++++-
 raspi_master.yaml  | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/generate-recipe.py b/generate-recipe.py
index a5cbf7b..21e8972 100755
--- a/generate-recipe.py
+++ b/generate-recipe.py
@@ -2,6 +2,7 @@
 
 import re
 import sys
+import subprocess
 
 # pylint: disable=invalid-name
 
@@ -128,6 +129,7 @@ if suite == 'buster':
 else:
     systemd_timesyncd = 'systemd-timesyncd'
 
+gitcommit = subprocess.getoutput("git show -s --pretty='format:%C(auto)%h (%s, %ad)' --date=short ")
 
 ### Write results:
 
@@ -164,7 +166,8 @@ with open('raspi_master.yaml', 'r') as in_file:
             .replace('__WIRELESS_FIRMWARE__', wireless_firmware) \
             .replace('__SERIAL_CONSOLE__', serial) \
             .replace('__HOST__', hostname) \
-            .replace('__TOUCH_MACHINE_ID__', touch_machine_id)
+            .replace('__TOUCH_MACHINE_ID__', touch_machine_id) \
+            .replace('__GITCOMMIT__', gitcommit)
 
         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)
diff --git a/raspi_master.yaml b/raspi_master.yaml
index cc7e708..fe817ac 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -1,4 +1,5 @@
 # See https://wiki.debian.org/RaspberryPi3 for known issues and more details.
+# image.yml based on revision: __GITCOMMIT__
 
 steps:
   - mkimg: "{{ output }}"
@@ -170,3 +171,8 @@ steps:
     shell: |
       rm -f /etc/machine-id /var/lib/dbus/machine-id
       __TOUCH_MACHINE_ID__
+
+  # Create /etc/raspi-image-id to know, from what commit the image was built
+  - chroot: /
+    shell: |
+      echo "image based on revision: __GITCOMMIT__ " > "/etc/raspi-image-id"