From 55108adfb006ae8833aad7553ea6e6825fa96b36 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 16 Jun 2017 17:17:19 +0200
Subject: archbuild.in: set pacman cache dir to /var/cache/archbuild32 in case
 of non-x86_64-build, so we do not use any-packages from x86_64 mirrors, and
 cross-mount inside to /var/cache/pacman/pkg

---
 arch-nspawn.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'arch-nspawn.in')

diff --git a/arch-nspawn.in b/arch-nspawn.in
index 93d3bf7..cf6c236 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -92,6 +92,7 @@ copy_hostconf () {
 	done
 
 	sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$working_dir/etc/pacman.conf"
+	eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
 	sed -i '/^Architecture = /s| auto$| '"$CARCH|" "$working_dir/etc/pacman.conf"
 }
 # }}}
@@ -108,8 +109,6 @@ fi
 build_mount_args
 copy_hostconf
 
-eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
-
 [[ -z $nosetarch ]] || unset CARCH
 
 exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
-- 
cgit v1.2.3-70-g09d2