summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-04-30 14:21:21 +0200
committerHolger Levsen <holger@layer-acht.org>2017-04-30 14:21:21 +0200
commit0cda9604106056e0524079be899892a7a72f8373 (patch)
treeb3980828cfdb94dfed3a8bb9f42c34fc72c82b6a
parent684ad594a8e320bcf69f0bbddb0d6edf79553789 (diff)
downloadjenkins.debian.net-0cda9604106056e0524079be899892a7a72f8373.tar.xz
reproducible LEDE/OpenWrt: cut off debug-noise from project banner file
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--bin/reproducible_lede_common.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/reproducible_lede_common.sh b/bin/reproducible_lede_common.sh
index 5fe9f9a2..8f628702 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/