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-05-31 16:09:42 +0200
commit52b58b0f8e1a4ccde39b6ce1f41167d8a22d093f (patch)
treec1514bab60a3d1e6d1504c05c839636aece8f62f /arch-nspawn.in
parent70e938432e7042e9e6be49294e85c3a2e89c7603 (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 8182120..56e75eb 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -93,6 +93,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"
}
# }}}
@@ -109,8 +110,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 \