From 1542df26bd0d4ac34df04528bb6cb4eda8388002 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Wed, 28 Jun 2017 00:20:14 +0200 Subject: reproducible LEDE: move `git log -1 > .html` to node_document_environment Removes also the garbage in the git commit section Signed-off-by: Holger Levsen --- bin/reproducible_lede_common.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'bin/reproducible_lede_common.sh') diff --git a/bin/reproducible_lede_common.sh b/bin/reproducible_lede_common.sh index 5301c3d0..85b0867f 100644 --- a/bin/reproducible_lede_common.sh +++ b/bin/reproducible_lede_common.sh @@ -79,7 +79,12 @@ node_document_environment() { local toolchain_html=$tmpdir/toolchain.html cd $tmpdir/build/source - echo "" > $toolchain_html + cat /dev/null > $toolchain_html + echo "
Target toolchains built
git commit built
" >> $toolchain_html + git log -1 >> $toolchain_html + echo "
" >> $toolchain_html + + echo "" >> $toolchain_html for i in $(ls -1d staging_dir/toolchain*|cut -d "-" -f2-|xargs echo) ; do echo " " >> $toolchain_html done @@ -334,14 +339,6 @@ openwrt_download() { done } -openwrt_get_commit() { - TMPDIR=$1 - TYPE=$2 - cd $TMPDIR/build/source - git log -1 -} - - openwrt_get_banner() { TMPDIR=$1 TYPE=$2 @@ -421,7 +418,6 @@ 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
Target toolchains built
$i