From e162e9a17b208dd535adf183cdc8fd8add7ddd4f Mon Sep 17 00:00:00 2001
From: Johan Gunnarsson <johan.gunnarsson@gmail.com>
Date: Sat, 8 Jul 2023 19:39:27 +0200
Subject: [PATCH] Save versions into versions.csv

---
 scripts/build-atf        | 3 +++
 scripts/build-boot       | 3 ++-
 scripts/build-boot-meson | 3 +++
 scripts/build-boot-rpi   | 3 +++
 scripts/build-debian     | 4 ++++
 scripts/build-u_boot     | 3 +++
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/build-atf b/scripts/build-atf
index 38bab45..b97282a 100755
--- a/scripts/build-atf
+++ b/scripts/build-atf
@@ -20,6 +20,9 @@ else
 	          "${ATF_GIT_URL:-${ATF_GIT_URL_DEFAULT}}" arm-trusted-firmware
 fi
 
+# Collect version of ATF
+(echo -n atf,; git -C arm-trusted-firmware describe --tags --always --abbrev=10) >> versions.csv
+
 # Step into ATF directory
 cd arm-trusted-firmware
 
diff --git a/scripts/build-boot b/scripts/build-boot
index f8199e8..014d131 100755
--- a/scripts/build-boot
+++ b/scripts/build-boot
@@ -41,4 +41,5 @@ truncate -s 32M tmp.img
 pigz tmp.img
 
 mkdir -p "${ARTIFACTS_DIR:-/artifacts}"
-cp tmp.img.gz "${ARTIFACTS_DIR:-/artifacts}/boot-${BOARD_ID}.bin.gz"
+cp -v versions.csv "${ARTIFACTS_DIR:-/artifacts}/boot-${BOARD_ID}.bin.gz.versions.csv"
+cp -v tmp.img.gz "${ARTIFACTS_DIR:-/artifacts}/boot-${BOARD_ID}.bin.gz"
diff --git a/scripts/build-boot-meson b/scripts/build-boot-meson
index 104fa7f..24e3ecf 100755
--- a/scripts/build-boot-meson
+++ b/scripts/build-boot-meson
@@ -22,6 +22,9 @@ else
 	          "${AMLOGIC_BOOT_FIP_GIT_URL:-${AMLOGIC_BOOT_FIP_GIT_URL_DEFAULT}}" amlogic-boot-fip
 fi
 
+# Collect version of amlogic-boot-fip
+(echo -n amlogic-boot-fip,; git -C amlogic-boot-fip describe --tags --always --abbrev=10) >> versions.csv
+
 build-u_boot "${DEFCONFIG}" "${TUPLE}"
 
 cd amlogic-boot-fip
diff --git a/scripts/build-boot-rpi b/scripts/build-boot-rpi
index 28656a7..223eb4d 100755
--- a/scripts/build-boot-rpi
+++ b/scripts/build-boot-rpi
@@ -23,6 +23,9 @@ else
 	          "${RPI_FIRMWARE_GIT_URL:-${RPI_FIRMWARE_GIT_URL_DEFAULT}}" rpi-firmware
 fi
 
+# Collect version of firmware
+(echo -n rpi-firmware,; git -C rpi-firmware describe --tags --always --abbrev=10) >> versions.csv
+
 build-u_boot "${DEFCONFIG}" "${TUPLE}"
 
 # Write Raspberry Pi boot config
diff --git a/scripts/build-debian b/scripts/build-debian
index 563a5a8..c71ae1c 100755
--- a/scripts/build-debian
+++ b/scripts/build-debian
@@ -158,6 +158,7 @@ chroot debian /bin/sh -ex <<- EOF
 /usr/bin/apt-get -y install systemd-resolved || :
 /usr/bin/apt-get clean
 /bin/rm -rf /var/lib/apt/lists/*
+/usr/bin/dpkg-query --showformat='kernel,\${Version}\n' --show ${KERNEL} > /tmp/versions.csv
 /usr/bin/systemctl enable systemd-networkd.service
 /usr/bin/systemctl enable systemd-resolved.service
 /usr/bin/systemctl enable systemd-timesyncd.service
@@ -180,6 +181,8 @@ ln -sf /run/systemd/resolve/stub-resolv.conf debian/etc/resolv.conf
 # List all files
 find debian ! -type d -printf "/%P\n" | sort > files.txt
 
+mv debian/tmp/versions.csv versions.csv
+
 # Make a ext4 filesystem of this and put it into the image
 # >>> ((3800000000 - 32 * 1024 * 1024) // (1024 * 1024)) * (1024 * 1024)
 # 3765436416
@@ -190,4 +193,5 @@ pigz ext4.img
 
 mkdir -p "${ARTIFACTS_DIR:-/artifacts}"
 cp -v files.txt "${ARTIFACTS_DIR:-/artifacts}/${OS}-${DIST}-${ARCH}-${PASSWORD}.bin.gz.files.txt"
+cp -v versions.csv "${ARTIFACTS_DIR:-/artifacts}/${OS}-${DIST}-${ARCH}-${PASSWORD}.bin.gz.versions.csv"
 cp -v ext4.img.gz "${ARTIFACTS_DIR:-/artifacts}/${OS}-${DIST}-${ARCH}-${PASSWORD}.bin.gz"
diff --git a/scripts/build-u_boot b/scripts/build-u_boot
index f519d5f..7d175f2 100755
--- a/scripts/build-u_boot
+++ b/scripts/build-u_boot
@@ -20,6 +20,9 @@ else
 	          "${U_BOOT_GIT_URL:-${U_BOOT_GIT_URL_DEFAULT}}" u-boot
 fi
 
+# Collect version of U-Boot
+(echo -n u-boot,; git -C u-boot describe --tags --always --abbrev=10) >> versions.csv
+
 # Step into U-Boot directory
 cd u-boot