summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-12 13:47:47 +0200
committerErich Eckner <git@eckner.net>2019-04-12 13:47:47 +0200
commit468a3a4c25176d0310197f9e4cbb1328e76bceed (patch)
tree0a6982af7c9a3bda3903b7fd2bc314d80e2c48bf /bin
parent4ee0c258069cb2f71b37e562b8994bc1165b9441 (diff)
downloadbuilder-468a3a4c25176d0310197f9e4cbb1328e76bceed.tar.xz
pentium4 is new
Diffstat (limited to 'bin')
-rwxr-xr-xbin/seed-build-list9
-rwxr-xr-xbin/update-pacman-dbs2
-rwxr-xr-xbin/wtf4
3 files changed, 10 insertions, 5 deletions
diff --git a/bin/seed-build-list b/bin/seed-build-list
index 566be63..5f964e1 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -183,7 +183,7 @@ if [ -s "${tmp_dir}/mirrors" ]; then
N
s/^.*\n//
/^lib32-/d
- s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2/
+ s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2\n\1pentium4\2/
' | \
sed '
s/^\(.*\)-\([^-]\+-[^-]\+\)-\([^-]\+\)$/theirs \2 \3 \1/
@@ -204,7 +204,7 @@ if [ -s "${tmp_dir}/mirrors" ]; then
mysql_run_query | \
sed '
s/^\(.*\)-\([^-]\+-[^-.]\+\)\(\.[^-.]\+\)\?-\([^-]\+\)$/ours \2 \4 \1/
- s/^\(.* \)any\(\.\S\+ \S\+\)$/\0\n\1i486\2\n\1i686\2\n/
+ s/^\(.* \)any\(\.\S\+ \S\+\)$/\0\n\1i486\2\n\1i686\2\n\1pentium4\2/
'
} | \
expand_version 2 | \
@@ -240,7 +240,7 @@ if [ -s "${tmp_dir}/undelete-mirrors" ]; then
N
s/^.*\n//
/^lib32-/d
- s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2/
+ s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2\n\1pentium4\2/
' | \
sed '
s/^\(.*\)\(-[^-]\+\)\{3\}$/\1/
@@ -397,7 +397,8 @@ fi
printf ' ON `binary_packages`.`id`=`least_stable_bp`.`id`'
# 1)
printf ' WHERE `least_stable_bp`.`is_on_build_list`'
- # TODO: care about i486 and any here, too - if it is complete enough
+ # TODO: care about i486 and pentium4 and any here, too - if it is
+ # complete enough
# shellcheck disable=SC2154
printf ' OR `binary_packages`.`architecture`!=%s;\n' \
"${architecture_ids__i686}"
diff --git a/bin/update-pacman-dbs b/bin/update-pacman-dbs
index ea601c9..49a4af6 100755
--- a/bin/update-pacman-dbs
+++ b/bin/update-pacman-dbs
@@ -6,7 +6,7 @@ base_dir=$(
pacman -Syy
-for arch in i486 i686; do
+for arch in i486 i686 pentium4; do
pacman --config "${base_dir}/misc/pacman-${arch}.conf" -Syy
su master -c 'pkgfile -C '"${base_dir}"'/misc/pacman-'"${arch}"'.conf -D '"${base_dir}"'/work/pkgfile-'"${arch}"'.cache -u'
diff --git a/bin/wtf b/bin/wtf
index 2a59aab..2cc80aa 100755
--- a/bin/wtf
+++ b/bin/wtf
@@ -27,6 +27,10 @@ case ${search%% *} in
arch='i686'
search="${search#* }"
;;
+ 'pentium4')
+ arch='pentium4'
+ search="${search#* }"
+ ;;
*)
arch='i686'
;;