summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-14 19:52:40 +0200
committerErich Eckner <git@eckner.net>2019-04-14 19:52:40 +0200
commit9a82ed08075a94a1da785a8797ad9b6e3304f6e1 (patch)
treebaaa35b30eff93283435a24110b94912399a536c
parentff370122a964424f729fc4e478a1a84cc967a074 (diff)
downloadbuilder-9a82ed08075a94a1da785a8797ad9b6e3304f6e1.tar.xz
bin/get-assignment,bin/build-packages: b408d8f introduced a bug, let's revert most of it and add a TODO
-rwxr-xr-xbin/build-packages6
-rwxr-xr-xbin/get-assignment4
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'