[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible OpenWrt: use "IGNORE_ERRORS=n y m" similiar to buildbot

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
961e44ec by Alexander Couzens at 2019-06-07T14:10:05Z
reproducible OpenWrt: use "IGNORE_ERRORS=n y m" similiar to buildbot

The OPTIONS is now an bash array to ensure the argument are correctly
give towards make.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_openwrt.sh


Changes:

=====================================
bin/reproducible_openwrt.sh
=====================================
@@ -246,10 +246,10 @@ openwrt_build_toolchain() {
 	echo "$(date -u) - Building the toolchain."
 	echo "============================================================================="
 
-	OPTIONS="-j $NUM_CPU IGNORE_ERRORS=ym BUILD_LOG=1"
+	OPTIONS=('-j' "$NUM_CPU" 'IGNORE_ERRORS=n m y' 'BUILD_LOG=1')
 
-	ionice -c 3 make $OPTIONS tools/install
-	ionice -c 3 make $OPTIONS toolchain/install
+	ionice -c 3 make "${OPTIONS[@]}" tools/install
+	ionice -c 3 make "${OPTIONS[@]}" toolchain/install
 }
 
 # RUN - b1 or b2. b1 means first run, b2 second
@@ -258,7 +258,7 @@ openwrt_compile() {
 	local RUN=$1
 	local TARGET=$2
 
-	OPTIONS="-j $NUM_CPU IGNORE_ERRORS=ym BUILD_LOG=1"
+	OPTIONS=('-j' "$NUM_CPU" 'IGNORE_ERRORS=n m y' 'BUILD_LOG=1')
 
 	# make $RUN more human readable
 	[ "$RUN" = "b1" ] && RUN="first"
@@ -267,7 +267,7 @@ openwrt_compile() {
 	echo "============================================================================="
 	echo "$(date -u) - Building OpenWrt ${OPENWRT_VERSION} ($TARGET) - $RUN build run."
 	echo "============================================================================="
-	ionice -c 3 $MAKE $OPTIONS
+	ionice -c 3 $MAKE "${OPTIONS[@]}"
 
 	openwrt_strip_metadata_signature "$PWD"
 }



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/961e44ec1d6f509534e660c5c20a8549a9f8895f

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/961e44ec1d6f509534e660c5c20a8549a9f8895f
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190607/7c0d1ddf/attachment-0001.html>