[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: Pass pbuilder the --binary-arch argument when building

[Vagrant Cascadian]

Vagrant Cascadian pushed to branch master at Debian QA / jenkins.debian.net


Commits:
0c838739 by Vagrant Cascadian at 2020-01-12T15:46:18-08:00
reproducible: Pass pbuilder the --binary-arch argument when building
u-boot on armhf.

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -603,10 +603,12 @@ EOF
 		echo "USENETWORK=yes" >> "$TMPCFG"
 	fi
 	DEBBUILDOPTS="-b"
+	BINARYTARGET=""
 	if [ "${ARCH}" = "armhf" ] && [ "${SRCPACKAGE}" = "u-boot" ]; then
 		# u-boot dependencies for arch:all on armhf are not available,
 		# as it uses cross-compilers for several architectures.
 		DEBBUILDOPTS="-B"
+		BINARYTARGET="--binary-arch"
 	fi
 	set +e
 	# remember to change the sudoers setting if you change the following command
@@ -614,6 +616,7 @@ EOF
 	  /usr/sbin/pbuilder --build \
 		--configfile $TMPCFG \
 		--debbuildopts "$DEBBUILDOPTS" \
+		$BINARYTARGET \
 		--basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz \
 		--buildresult $TMPDIR/b1 \
 		--logfile b1/build.log \
@@ -699,11 +702,13 @@ EOF
 			;;
 	esac
 	DEBBUILDOPTS="-b"
+	BINARYTARGET=""
 	if [ "${ARCH}" = "armhf" ] && [ "${SRCPACKAGE}" = "u-boot" ]; then
 		# u-boot dependencies for arch:all on armhf are not
 		# available, as it uses cross-compilers for several
 		# architectures.
 		DEBBUILDOPTS="-B"
+		BINARYTARGET="--binary-arch"
 	fi
 	set +e
 	# remember to change the sudoers setting if you change the following command
@@ -715,6 +720,7 @@ EOF
 			--configfile $TMPCFG \
 			--hookdir /etc/pbuilder/rebuild-hooks \
 			--debbuildopts "$DEBBUILDOPTS" \
+			$BINARYTARGET \
 			--basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz \
 			--buildresult $TMPDIR/b2 \
 			--logfile b2/build.log \



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/0c838739bff4c4f1a0302262dda5cdfe847e176e

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/0c838739bff4c4f1a0302262dda5cdfe847e176e
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/20200112/d7873ee8/attachment-0001.html>