[X2Go-Commits] [buildscripts] 02/03: bin/sbuild-deb-package: completely skip Architecture: all packages on ppc64{le, be} builders for good.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 0c4744d316406af5c2a91f39e5ead70a58f49a71
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Nov 30 05:09:43 2017 +0100

    bin/sbuild-deb-package: completely skip Architecture: all packages on ppc64{le,be} builders for good.
---
 bin/sbuild-deb-package | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index e61313b..fcf9a3f 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -326,6 +326,7 @@ build_packages() {
 					dch --distribution "${codename}" --force-distribution -l "~git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." "Development-Snapshot!!! Auto-built ${pretty_dist} ${l_CODENAME} (${numerical_version}) package for ${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})."
 				fi
 
+				typeset -i skip_arch_all="0"
 				typeset -a arches
 				arches=()
 				case "${PLATFORM}" in
@@ -333,9 +334,16 @@ build_packages() {
 						arches+=( "amd64" "i386" )
 						;;
 					("ppc64")
+						# Fpr ppc64{le,be{, we want to skip arch-indep binary packages
+						# even for the Architecture: all case, since such packages
+						# will already be built by our x86_64 builder.
+						skip_arch_all="1"
+
 						arches+=( "powerpc" "ppc64" )
 						;;
 					("ppc64le")
+						skip_arch_all="1"
+
 						arches+=( "ppc64el" )
 						;;
 				esac
@@ -402,14 +410,16 @@ build_packages() {
 				sbuild_options_ppc64el=("${sbuild_options[@]}" "--debbuildopts=-B")
 
 				typeset base_arch="${arches[0]}"
-				[ "x${SKIP_ARCH}" != "x${base_arch}" ] && grep -Eqs "Architecture.*(all|any|${base_arch})" "${TEMP_DIR}/${PROJECT}/debian/control" && {
-					typeset indirect="sbuild_options_${base_arch}[@]"
-					typeset -a indirect_resolve
-					indirect_resolve=("${!indirect}")
-
-					cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/${base_arch}"
-					nice ${SBUILD} "${indirect_resolve[@]}" "${TEMP_DIR}/${PROJECT}"
-				}
+				if [ -n "${base_arch}" ] && [ "x${SKIP_ARCH}" != "x${base_arch}" ] && grep -Eqs "Architecture.*(all|any|${base_arch})" "${TEMP_DIR}/${PROJECT}/debian/control"; then
+					if grep -Eqs 'Architecture.*all' "${TEMP_DIR}/${PROJECT}/debian/control" && [ "${skip_arch_all}" -eq "0" ]; then
+						typeset indirect="sbuild_options_${base_arch}[@]"
+						typeset -a indirect_resolve
+						indirect_resolve=("${!indirect}")
+
+						cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/${base_arch}"
+						nice ${SBUILD} "${indirect_resolve[@]}" "${TEMP_DIR}/${PROJECT}"
+					fi
+				fi
 
 				base_arch="${arches[1]}"
 				# Clear out the ppc64 arch if not building against unstable to skip this part.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git