[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible LEDE/OpenWrt: cut off debug-noise from project banner file

Holger Levsen holger at layer-acht.org
Sun Apr 30 12:21:40 UTC 2017


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 0cda9604106056e0524079be899892a7a72f8373
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Apr 30 14:21:21 2017 +0200

    reproducible LEDE/OpenWrt: cut off debug-noise from project banner file
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_lede_common.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/reproducible_lede_common.sh b/bin/reproducible_lede_common.sh
index 5fe9f9a..8f62870 100644
--- a/bin/reproducible_lede_common.sh
+++ b/bin/reproducible_lede_common.sh
@@ -269,7 +269,10 @@ openwrt_get_banner() {
 	TMPDIR=$1
 	TYPE=$2
 	cd $TMPDIR/build/source
+	echo "===bannerbegin==="
 	find build_dir/ -name banner | grep etc/banner|head -1| xargs cat /dev/null
+	echo "===bannerend==="
+
 }
 
 # openwrt_build is run on a remote host
@@ -342,6 +345,9 @@ 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
+	# 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
 
 	# rsync back logs and images
 	rsync -av $GENERIC_NODE1:$TMPDIR/$RUN/ $TMPDIR/$RUN/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list