Merge branch 'master' of ssh://git.archlinux32.org/builder

1 files changed, 33 insertions, 6 deletions

diff --git a/bin/build-packages b/bin/build-packages
index 8405579..de01478 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -78,6 +78,8 @@ usage() {
   >&2 echo '    compile from source tarbal from sources.archlinux.org if possible'
   >&2 echo '  :mirrored_source_by_hash:'
   >&2 echo '    download sources from sources.archlinux32.org by hash if possible'
+  >&2 echo '  :on_x86_64:'
+  >&2 echo '    build any package with x86_64 arch'
   >&2 echo '  :without_check:'
   >&2 echo '    run makepkg with "--no-check"'
   >&2 echo '  :without_systemd_nspawn:'
@@ -249,7 +251,7 @@ while [ "${count}" -ne 0 ] && \
   if [ -z "${forced_package}" ]; then
     package=$(
       # shellcheck disable=SC2029
-      ssh \
+      ssh -o PasswordAuthentication=No \
         -i "${master_build_server_identity}" \
         -p "${master_build_server_port}" \
         "${master_build_server_user}@${master_build_server}" \
@@ -291,6 +293,9 @@ while [ "${count}" -ne 0 ] && \
       package="${package% *}"
       if [ "${arch}" = 'any' ]; then
         arch="${my_arch}"
+        assignment_was_any=true
+      else
+        assignment_was_any=false
       fi
 
       if [ -n "${diff_source_dir}" ] &&
@@ -298,7 +303,7 @@ while [ "${count}" -ne 0 ] && \
         >&2 echo 'The prefered package was not handed out.'
         >&2 echo 'Because -d was given, I will abort.'
         # shellcheck disable=SC2029
-        ssh \
+        ssh -o PasswordAuthentication=No \
           -i "${master_build_server_identity}" \
           -p "${master_build_server_port}" \
           "${master_build_server_user}@${master_build_server}" \
@@ -383,7 +388,7 @@ while [ "${count}" -ne 0 ] && \
         ! apply_trunk_patch "${tmp_dir}" "${diff_source_dir}"; then
         # report local failure (probably a missing commit) to build-master
         # shellcheck disable=SC2029
-        ssh \
+        ssh -o PasswordAuthentication=No \
           -i "${master_build_server_identity}" \
           -p "${master_build_server_port}" \
           "${master_build_server_user}@${master_build_server}" \
@@ -459,7 +464,7 @@ while [ "${count}" -ne 0 ] && \
             >&2 echo 'The prefered package was not handed out.'
             >&2 echo 'Because straw :without_systemd_nspawn: is active, I will abort.'
             # shellcheck disable=SC2029
-            ssh \
+            ssh -o PasswordAuthentication=No \
               -i "${master_build_server_identity}" \
               -p "${master_build_server_port}" \
               "${master_build_server_user}@${master_build_server}" \
@@ -485,6 +490,28 @@ while [ "${count}" -ne 0 ] && \
           outerParameters="${innerParameters} -fcrs --asdeps --noconfirm --holdver"
           middleParameters=''
           innerParameters=''
+        elif echo "${straw}" | \
+          grep -qF ':on_x86_64:'; then
+          if [ -z "${prefered_package}" ]; then
+            >&2 echo 'straw :on_x86_64: only allowed with -p'
+            exit 2
+          fi
+          if [ "${prefered_package}" != "${package}" ]; then
+            >&2 echo 'The prefered package was not handed out.'
+            >&2 echo 'Because straw :on_x86_64: is active, I will abort.'
+            # shellcheck disable=SC2029
+            ssh -o PasswordAuthentication=No \
+              -i "${master_build_server_identity}" \
+              -p "${master_build_server_port}" \
+              "${master_build_server_user}@${master_build_server}" \
+              'return-assignment' 'ABORT'
+            exit 2
+          fi
+          if ! ${assignment_was_any}; then
+            >&2 printf 'Can only build "any" packages with :on_x86_64:, but got a "%s" package.\n' "${arch}"
+            exit 2
+          fi
+          build_command='staging-x86_64-build'
         else
           build_command='staging-'"${arch}"'-build'
         fi
@@ -1023,7 +1050,7 @@ while [ "${count}" -ne 0 ] && \
           while ${upload_to_build_master}; do
             err=0
             # shellcheck disable=SC2029
-            ssh \
+            ssh -o PasswordAuthentication=No \
               -i "${master_build_server_identity}" \
               -p "${master_build_server_port}" \
               "${master_build_server_user}@${master_build_server}" \
@@ -1086,7 +1113,7 @@ while [ "${count}" -ne 0 ] && \
           while true; do
             err=0
             # shellcheck disable=SC2029
-            ssh \
+            ssh -o PasswordAuthentication=No \
               -i "${master_build_server_identity}" \
               -p "${master_build_server_port}" \
               "${master_build_server_user}@${master_build_server}" \