summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-14 11:00:04 +0200
committerErich Eckner <git@eckner.net>2018-09-14 11:00:04 +0200
commitb4a3d61b3f51cbdf5af23002ede2fbf08cd9f3a9 (patch)
tree74ae0cc30f155cfd27633b7c430e27f2fbbdeef6
parentdd10a4f0c1d4f4d7957fd1778916b9e2a37c0c84 (diff)
downloadbuilder-b4a3d61b3f51cbdf5af23002ede2fbf08cd9f3a9.tar.xz
use i486 in more places
-rwxr-xr-xbin/seed-build-list4
-rwxr-xr-xlib/common-functions2
-rwxr-xr-xlib/load-configuration2
-rwxr-xr-xlib/mysql-functions9
4 files changed, 12 insertions, 5 deletions
diff --git a/bin/seed-build-list b/bin/seed-build-list
index 83ba460..2cabe38 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -177,7 +177,7 @@ if [ -s "${tmp_dir}/mirrors" ]; then
N
s/^.*\n//
/^lib32-/d
- s/-x86_64\(\.pkg\.tar\.xz\)$/-i686\1/
+ s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i686\2\n\1i486\2/
s/^\(.*\)-\([^-]\+-[^-]\+\)-\([^-]\+\)$/theirs \2 \3 \1/
'
done
@@ -230,7 +230,7 @@ if [ -s "${tmp_dir}/undelete-mirrors" ]; then
/^%FILENAME%$/!d
N
s/^.*\n//
- s/-x86_64\(\.pkg\.tar\.xz\)$/-i686\1/
+ s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i686\2\n\1i486\2/
/^lib32-/d
s/^\(.*\)\(-[^-]\+\)\{3\}$/\1/
'
diff --git a/lib/common-functions b/lib/common-functions
index 92d5726..2d96350 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -557,7 +557,7 @@ download_sources_by_hash() {
return 1
fi
- for arch_suffix in '' '_i686'; do
+ for arch_suffix in '' '_i486' '_i686'; do
for sum_type in 'md5sum' 'sha1sum' 'sha256sum' 'sha512sum'; do
grep '^\s*'"${sum_type}s${arch_suffix}"' = ' "${tmp_dir}/.SRCINFO" | \
sed 's|^.* = ||' | \
diff --git a/lib/load-configuration b/lib/load-configuration
index 0100bd9..4f6b26a 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -91,7 +91,7 @@ build_log_directory='/srv/http/build-logs'
irc_dir='/home/slave/irc/irc.freenode.net'
irc_password='top_secret'
-# commands to run to update the i686 package mirror used for installing i686 packages,
+# commands to run to update the package mirror used for installing archlinux32 packages,
# e.g. the one from /etc/pacman.d/mirrorlist32 (useful on build slaves which do not
# have the master mirror in the mirrorlist32)
mirror_update_command=''
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 3006262..31bdfd0 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -604,7 +604,14 @@ mysql_sanity_check() {
temp_dir=$(mktemp -d 'tmp.mysql-functions.mysql_sanity_check.XXXXXXXXXX' --tmpdir)
trap 'rm -rf --one-file-system "${temp_dir}"' EXIT
- for arch in 'i486' 'i686'; do
+ {
+ printf 'SELECT DISTINCT `architectures`.`name`'
+ printf ' FROM `architectures`'
+ printf ' WHERE `architectures`.`id`!=%s;\n' \
+ "${architecture_ids__any}"
+ } | \
+ mysql_run_query | \
+ while read -r arch; do
for dir in $(ls_master_mirror "${arch}"); do
ls_master_mirror "${arch}/${dir}" | \
sed '