From 9a82ed08075a94a1da785a8797ad9b6e3304f6e1 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sun, 14 Apr 2019 19:52:40 +0200 Subject: bin/get-assignment,bin/build-packages: b408d8f introduced a bug, let's revert most of it and add a TODO --- bin/build-packages | 6 +++--- bin/get-assignment | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/build-packages b/bin/build-packages index 19e836f..447c15c 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -217,15 +217,15 @@ while [ "${count}" -ne 0 ] && \ arch='i686' fi ;; -# TODO: someone should request build assignments for "pentium4" -# It's probably a good idea to let pentium4 build slaves also build i686 -# if there is need. *) >&2 printf 'Sorry, architecture %s does not work (yet) as a build slave.\n' \ "$(uname -m)" exit 2 ;; esac + # TODO: we might get a build assignment of a different architecture + # (e.g. a pentium4 slave might get an i686 assignment - we must take + # that into account for the build_command if [ -z "${forced_package}" ]; then package=$( # shellcheck disable=SC2029 diff --git a/bin/get-assignment b/bin/get-assignment index 5749f23..4bd8c5b 100755 --- a/bin/get-assignment +++ b/bin/get-assignment @@ -219,7 +219,9 @@ next_building=$( mysql_join_binary_packages_binary_packages_in_repositories printf ' JOIN `architecture_compatibilities`' printf ' ON `architecture_compatibilities`.`built_for`=`build_assignments`.`architecture`' - printf ' AND `architecture_compatibilities`.`build_slave_compatible`' + # TODO: this should become build_slave_compatible, once /all/ build slaves can handle + # forced build assignment architectures + printf ' AND `architecture_compatibilities`.`fully_compatible`' printf ' JOIN `architectures`' printf ' ON `architecture_compatibilities`.`runs_on`=`architectures`.`id`' printf ' LEFT' -- cgit v1.2.3-54-g00ecf