From b2303fbececd4aa117f385dca376934364117b16 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Mon, 20 May 2019 14:10:35 -0400
Subject: archbuild: prefer repo/arch-specific configs if they exist

When mixing and matching different repos and architectures not present
in mainline archlinux, it is sometimes desirable to set up differing
presets with more granularity than devtools currently allows.

One example of this is when building for architectures that are only
supported by another project -- in order to coexist on a mainline
archlinux host, a different mirrorlist needs to be used.
---
 archbuild.in | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/archbuild.in b/archbuild.in
index 163a108..4ddc097 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -20,6 +20,15 @@ fi
 chroots='/var/lib/archbuild'
 clean_first=false
 
+pacman_config=@pkgdatadir@/pacman-${repo}.conf
+if [[ -f ${pacman_config%.conf}-${arch}.conf ]]; then
+    pacman_config=${pacman_config%.conf}-${arch}.conf
+fi
+makepkg_config=@pkgdatadir@/makepkg-${arch}.conf
+if [[ -f ${makepkg_config%-${arch}.conf}-${repo}-${arch}.conf ]]; then
+    makepkg_config=${makepkg_config%-${arch}.conf}-${repo}-${arch}.conf
+fi
+
 usage() {
 	echo "Usage: $cmd [options] -- [makechrootpkg args]"
 	echo '    -h         This help'
@@ -61,15 +70,15 @@ 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" \
-		-M "@pkgdatadir@/makepkg-${arch}.conf" \
+		-C "${pacman_config}" \
+		-M "${makepkg_config}" \
 		"${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" \
-		-M "@pkgdatadir@/makepkg-${arch}.conf" \
+		-C "${pacman_config}" \
+		-M "${makepkg_config}" \
 		"${chroots}/${repo}-${arch}/root" \
 		pacman -Syu --noconfirm || abort
 fi
-- 
cgit v1.2.3-54-g00ecf