summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-06-13 11:43:13 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-13 11:43:13 +0200
commitf43ac07b0e49cb2337a736d187665546ff1596ad (patch)
tree427969fcb48cc6561a8f4f9c74b86d4dc6645e57
parentd1d8f7b2cfaaec2b2b92ffcab74c801f62a8926d (diff)
downloadjenkins.debian.net-f43ac07b0e49cb2337a736d187665546ff1596ad.tar.xz
reproducible openwrt and coreboot: improve job output
-rwxr-xr-xbin/reproducible_coreboot.sh10
-rwxr-xr-xbin/reproducible_openwrt.sh12
2 files changed, 11 insertions, 11 deletions
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index 2dc98d5f..5f672721 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -92,7 +92,7 @@ trap cleanup_tmpdirs INT TERM EXIT
cd $TMPBUILDDIR
echo "============================================================================="
-echo "$(date -u) - Cloning the coreboot git repository with submodules now."
+echo "$(date -u) - Cloning the coreboot git repository with submodules."
echo "============================================================================="
git clone --recursive http://review.coreboot.org/p/coreboot.git
cd coreboot
@@ -105,7 +105,7 @@ echo
git log -1
echo "============================================================================="
-echo "$(date -u) - Building cross compilers for ${ARCHS} now."
+echo "$(date -u) - Building cross compilers for ${ARCHS}."
GOT_XTOOLCHAIN=false
#
# build the cross toolchains
@@ -147,7 +147,7 @@ echo "</table>" >> $TOOLCHAIN_HTML
cd ../../..
echo "============================================================================="
-echo "$(date -u) - Building coreboot ${COREBOOT_VERSION} images now - first build run."
+echo "$(date -u) - Building coreboot ${COREBOOT_VERSION} images - first build run."
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT+12"
# prevent failing using more than one CPU
@@ -163,7 +163,7 @@ ionice -c 3 nice \
save_coreboot_results b1
echo "============================================================================="
-echo "$(date -u) - Building coreboot images now - second build run."
+echo "$(date -u) - Building coreboot images - second build run."
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT-14"
export LANG="fr_CH.UTF-8"
@@ -196,7 +196,7 @@ TIMEOUT="30m"
DBDSUITE="unstable"
DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
echo "============================================================================="
-echo "$(date -u) - Running $DBDVERSION on coreboot images now"
+echo "$(date -u) - Running $DBDVERSION on coreboot images."
echo "============================================================================="
ROMS_HTML=$(mktemp)
echo " <ul>" > $ROMS_HTML
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index b94e1f0f..12c00636 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -79,7 +79,7 @@ save_openwrt_results(){
cd packages
for j in $(find * -name "*.ipk") ; do
mkdir -p $TMPDIR/$RUN/$i/ipk/$(dirname $j)
- cp -p $j $TMPDIR/$RUN/$i/ipk/$(dirname $j)
+ cp -p $j $TMPDIR/$RUN/$i/ipk/$(dirname $j)/
done
cd ../..
done
@@ -97,7 +97,7 @@ trap cleanup_tmpdirs INT TERM EXIT
cd $TMPBUILDDIR
echo "============================================================================="
-echo "$(date -u) - Cloning the OpenWRT git repository now."
+echo "$(date -u) - Cloning the OpenWRT git repository."
echo "============================================================================="
git clone git://git.openwrt.org/openwrt.git
cd openwrt
@@ -114,7 +114,7 @@ echo "==========================================================================
./scripts/feeds install -a
echo "============================================================================="
-echo "$(date -u) - Building the toolchain now."
+echo "$(date -u) - Building the toolchain."
echo "============================================================================="
make defconfig
ionice -c 3 nice \
@@ -123,7 +123,7 @@ ionice -c 3 nice \
make -j $NUM_CPU toolchain/install
echo "============================================================================="
-echo "$(date -u) - Building openwrt ${OPENWRT_VERSION} images now - first build run."
+echo "$(date -u) - Building OpenWRT ${OPENWRT_VERSION} - first build run."
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT+12"
# actually build everything
@@ -149,7 +149,7 @@ rm staging_dir/target-* -r
rm bin/* -r
echo "============================================================================="
-echo "$(date -u) - Building openwrt images now - second build run."
+echo "$(date -u) - Building OpenWRT - second build run."
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT-14"
export LANG="fr_CH.UTF-8"
@@ -219,7 +219,7 @@ TIMEOUT="30m"
DBDSUITE="unstable"
DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
echo "============================================================================="
-echo "$(date -u) - Running $DBDVERSION on openwrt images now"
+echo "$(date -u) - Running $DBDVERSION on OpenWRT images and packages."
echo "============================================================================="
IMAGES_HTML=$(mktemp)
echo " <table><tr><th>Images for <code>$TARGET</code></th></tr>" > $IMAGES_HTML