From 3cfd593b1510f80bee564c2409cf0159e5abde3f Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 9 Jan 2020 00:10:22 +0100 Subject: configs/releng/build.sh: pin architecture in per-arch pacman.confs --- configs/releng/build.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 742a79d..15b8780 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')") @@ -62,6 +62,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 } # Prepare working directory and copy custom airootfs files (airootfs) -- cgit v1.2.3-54-g00ecf