From b76b0380450d3dea77f9a8d609888caa62e423b4 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Sat, 24 Jun 2017 18:54:27 +0200
Subject: reproducible_lede: collect the last git commit

Signed-off-by: Holger Levsen <holger@layer-acht.org>
---
 bin/reproducible_lede.sh        | 6 ++++--
 bin/reproducible_lede_common.sh | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_lede.sh b/bin/reproducible_lede.sh
index 24ef4fe8..d85bb062 100755
--- a/bin/reproducible_lede.sh
+++ b/bin/reproducible_lede.sh
@@ -28,6 +28,7 @@ case $1 in
 			openwrt_build |\
 			openwrt_download |\
 			openwrt_get_banner |\
+			openwrt_get_commit |\
 			node_create_tmpdirs |\
 			node_debug |\
 			node_save_logs |\
@@ -58,6 +59,7 @@ START=$(date +'%s')
 TMPBUILDDIR=$(mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-${DATE}-XXXXXXXX)  # used to build on tmpfs
 TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t rbuild-lede-results-XXXXXXXX)  # accessable in schroots, used to compare results
 BANNER_HTML=$(mktemp --tmpdir=$TMPDIR)
+GIT_COMMIT=$(mktemp --tmpdir=$TMPDIR)
 trap master_cleanup_tmpdirs INT TERM EXIT
 
 cd $TMPBUILDDIR
@@ -232,13 +234,13 @@ write_page "        These tests were last run on $DATE for version ${OPENWRT_VER
 write_variation_table LEDE
 cat $DBD_HTML >> $PAGE
 write_page "     <table><tr><th>git commit built</th></tr><tr><td><code>"
-echo -n "$OPENWRT" >> $PAGE
+cat $GIT_COMMIT >> $PAGE
 write_page "     </code></td></tr></table>"
 cat $TOOLCHAIN_HTML >> $PAGE
 write_page "    </div>"
 write_page_footer LEDE
 publish_page
-rm -f $DBD_HTML $DBD_GOOD_PKGS_HTML $DBD_BAD_PKGS_HTML $TOOLCHAIN_HTML $BANNER_HTML
+rm -f $DBD_HTML $DBD_GOOD_PKGS_HTML $DBD_BAD_PKGS_HTML $TOOLCHAIN_HTML $BANNER_HTML $GIT_COMMIT
 
 # the end
 calculate_build_duration
diff --git a/bin/reproducible_lede_common.sh b/bin/reproducible_lede_common.sh
index 37dda724..a4793b4b 100644
--- a/bin/reproducible_lede_common.sh
+++ b/bin/reproducible_lede_common.sh
@@ -333,6 +333,14 @@ openwrt_download() {
 	done
 }
 
+openwrt_get_commit() {
+	TMPDIR=$1
+	TYPE=$2
+	cd $TMPDIR/build/source
+	git log -1
+}
+
+
 openwrt_get_banner() {
 	TMPDIR=$1
 	TYPE=$2
@@ -412,6 +420,7 @@ build_two_times() {
 	RUN=b1
 	ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR
 	ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_get_banner $TMPDIR $TYPE > $BANNER_HTML
+	ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_get_commit $TMPDIR $TYPE > $GIT_COMMIT
 	# cut away everything before begin and after the end…
 	# (thats noise generated by the way we run this via reproducible_common.sh)
 	cat $BANNER_HTML | sed '/===bannerend===/,$d' | tac | sed '/===bannerbegin===/,$d' | tac > $BANNER_HTML
-- 
cgit v1.2.3-54-g00ecf