From 0d24b5e8a291a3f4f113b016f7a9d37ba3443fb2 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 1 Apr 2019 10:54:20 +0200
Subject: separate mirrorlist for i686 and x86_64

---
 archbuild.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'archbuild.in')

diff --git a/archbuild.in b/archbuild.in
index 163a108..31c6317 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -11,11 +11,17 @@ cmd="${0##*/}"
 if [[ "${cmd%%-*}" == 'multilib' ]]; then
 	repo="${cmd%-build}"
 	arch='x86_64'
+	arch_ext=''
 	base_packages+=(multilib-devel)
 else
 	tag="${cmd%-build}"
 	repo=${tag%-*}
 	arch=${tag##*-}
+	if [ "${arch}" = 'x86_64' ]; then
+		arch_ext=''
+	else
+		arch_ext="-${arch}"
+	fi
 fi
 chroots='/var/lib/archbuild'
 clean_first=false
@@ -61,14 +67,14 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 	rm -rf --one-file-system "${chroots}/${repo}-${arch}"
 	mkdir -p "${chroots}/${repo}-${arch}"
 	setarch "${arch}" mkarchroot \
-		-C "@pkgdatadir@/pacman-${repo}.conf" \
+		-C "@pkgdatadir@/pacman-${repo}${arch_ext}.conf" \
 		-M "@pkgdatadir@/makepkg-${arch}.conf" \
 		"${chroots}/${repo}-${arch}/root" \
 		"${base_packages[@]}" || abort
 else
 	lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot"
 	arch-nspawn \
-		-C "@pkgdatadir@/pacman-${repo}.conf" \
+		-C "@pkgdatadir@/pacman-${repo}${arch_ext}.conf" \
 		-M "@pkgdatadir@/makepkg-${arch}.conf" \
 		"${chroots}/${repo}-${arch}/root" \
 		pacman -Syu --noconfirm || abort
-- 
cgit v1.2.3-54-g00ecf