summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2016-07-29 14:09:41 -0400
committerHolger Levsen <holger@layer-acht.org>2016-07-29 17:03:06 -0400
commitc813c233bb6083121966f286534477f405c996ca (patch)
treea2f5231c870da049aa4c672eb3b539dc3e88b37f
parent1de9196e2580c4757cadd0306b4a152b4c57d6cd (diff)
downloadjenkins.debian.net-c813c233bb6083121966f286534477f405c996ca.tar.xz
reproducible_openwrt_common: b1/b2 for openwrt_build
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--bin/reproducible_openwrt_common.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index 42e65d77..a36fbc22 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -126,6 +126,10 @@ openwrt_build() {
OPTIONS="-j $NUM_CPU IGNORE_ERRORS=ym BUILD_LOG=1"
+ # make $RUN more human readable
+ [ "$RUN" = "b1" ] && RUN="first"
+ [ "$RUN" = "b2" ] && RUN="second"
+
echo "============================================================================="
echo "$(date -u) - Building OpenWrt ${OPENWRT_VERSION} ($TARGET) - $RUN build run."
echo "============================================================================="
@@ -159,7 +163,7 @@ build_two_times() {
# FIRST BUILD
export TZ="/usr/share/zoneinfo/Etc/GMT+12"
MAKE=make
- openwrt_build "first" "$TARGET"
+ openwrt_build b1 "$TARGET"
# get banner
cat $(find build_dir/ -name banner | grep etc/banner|head -1) > $BANNER_HTML
@@ -184,7 +188,7 @@ build_two_times() {
# use allmost all cores for second build
NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
MAKE="linux64 --uname-2.6 make"
- openwrt_build "second" "$TARGET"
+ openwrt_build b2 "$TARGET"
# save results in b2
[ "$TYPE" = "lede" ] && save_lede_results b2