Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/arch-nspawn.in
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-06-16 17:17:19 +0200
committerErich Eckner <git@eckner.net>2018-03-24 21:36:02 +0100
commit55108adfb006ae8833aad7553ea6e6825fa96b36 (patch)
tree9f8b02d8b0931f2350b2d9925ba9d6bceee3ede2 /arch-nspawn.in
parente0e74e36b1eac33c9206e2654b17b16723cd3e22 (diff)
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
Diffstat (limited to 'arch-nspawn.in')
-rw-r--r--arch-nspawn.in3
1 files changed, 1 insertions, 2 deletions
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 \