From 74764a6579a298b95d7cd5a0e2f8860717ac48ca Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
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(-)

(limited to 'configs/releng')

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)
-- 
cgit v1.2.3-70-g09d2