summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-23 19:11:32 -0500
committerHolger Levsen <holger@layer-acht.org>2015-10-23 19:11:32 -0500
commit47adac08044c9fcfe080c9a705644f65b67eb53e (patch)
treefd44fa2850b21daf241c349cb6053673f1eee1b7
parent003fcc583aa4ee2bb310197597556880226d0ae5 (diff)
downloadjenkins.debian.net-47adac08044c9fcfe080c9a705644f65b67eb53e.tar.xz
reprodducible openwrt: save banner before cleanup
-rwxr-xr-xbin/reproducible_openwrt.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index d344ae25..c42d1525 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -23,6 +23,7 @@ cleanup_tmpdirs() {
fi
rm -rf $TMPDIR
rm -rf $TMPBUILDDIR
+ rm -f $BANNER_HTML
}
create_results_dirs() {
@@ -113,6 +114,9 @@ build_two_times() {
MAKE=make
openwrt_build "first" "$TARGET"
+ # get banner
+ cat $(find build_dir/ -name banner | grep etc/banner|head -1) > $BANNER_HTML
+
# save results in b1
save_openwrt_results b1
@@ -150,6 +154,7 @@ build_two_times() {
#
TMPBUILDDIR=$(mktemp --tmpdir=/srv/workspace/chroots/ -d -t openwrt-XXXXXXXX) # used to build on tmpfs
TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d) # accessable in schroots, used to compare results
+BANNER_HTML=$(mktemp --tmpdir=$TMPDIR)
DATE=$(date -u +'%Y-%m-%d')
START=$(date +'%s')
trap cleanup_tmpdirs INT TERM EXIT
@@ -206,9 +211,6 @@ for i in gcc binutils bzip2 flex python perl make findutils grep diffutils unzip
echo " </td></tr>" >> $TOOLCHAIN_HTML
done
echo "</table>" >> $TOOLCHAIN_HTML
-# get banner
-BANNER_HTML=$(mktemp --tmpdir=$TMPDIR)
-cat $(find build_dir/ -name banner | grep etc/banner|head -1) >> $BANNER_HTML
# clean up builddir to save space on tmpfs
rm -rf $TMPBUILDDIR/openwrt