summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-01-09 00:10:22 +0100
committerErich Eckner <git@eckner.net>2020-01-09 00:14:24 +0100
commit74764a6579a298b95d7cd5a0e2f8860717ac48ca (patch)
treecdd325a0635fc55588b53138682b1d409610d26f
parent58ec4c7a561fae00a200d8b46d2ff0dea3e3f019 (diff)
downloadarchiso32-74764a6579a298b95d7cd5a0e2f8860717ac48ca.tar.xz
configs/releng/build.sh: pin architecture in per-arch pacman.confs
-rwxr-xr-xconfigs/releng/build.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 34c35e6..eae48b8 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -52,7 +52,7 @@ run_once() {
fi
}
-# Setup custom pacman.conf with current cache directories and custom mirrorlist.
+# Setup custom pacman.conf with current cache directories and custom mirrorlist and custom architecture.
make_pacman_conf() {
local _cache_dirs
_cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
@@ -61,6 +61,14 @@ make_pacman_conf() {
s@/var/cache/pacman/pkg/@/var/cache/archbuild32/@
s@Include = /etc/pacman\.d/mirrorlist$@\032@
' ${work_dir}/pacman-x86_64.conf > ${work_dir}/pacman-i686.conf
+ local _conf
+ for _conf in ${work_dir}/pacman-*.conf; do
+ sed -i '
+ /^Architecture =/ s/=.*$/= '"${_conf##*/pacman-}"'/
+ T
+ s/\.conf$//
+ ' "$_conf"
+ done
}
# Base installation, plus needed packages (airootfs)