summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-06-16 21:31:37 +0200
committerErich Eckner <git@eckner.net>2017-06-16 21:31:37 +0200
commit0e8a0807547251e08560a213e7f940c16b4025be (patch)
tree9e6c9670befbfef584528a30c048d7c50a15b0f6
parent6d847f9c794f13515102e6d564c7d7336663c1a6 (diff)
downloaddevtools-20170616.tar.xz
bugfixes concerning $CARCH, Architecture= and --cachev20170616archlinux32/v20170616
-rw-r--r--arch-nspawn.in3
-rw-r--r--archbuild.in10
2 files changed, 6 insertions, 7 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 36ccf5b..8b3d84e 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -90,6 +90,7 @@ copy_hostconf () {
done
sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$working_dir/etc/pacman.conf"
+ eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
sed -i '/^Architecture = /s| auto$| '"$CARCH|" "$working_dir/etc/pacman.conf"
}
# }}}
@@ -106,8 +107,6 @@ fi
build_mount_args
copy_hostconf
-eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
-
[[ -z $nosetarch ]] || unset CARCH
exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
diff --git a/archbuild.in b/archbuild.in
index 4c51195..0ed88e6 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -41,17 +41,17 @@ done
check_root
-# Pass all arguments after -- right to makepkg
-makechrootpkg_args+=("${@:$OPTIND}")
-
if [ "${arch}" = "x86_64" ]; then
cache_dir=''
else
mkdir -p '/var/cache/archbuild32'
- cache_dir='-c /var/cache/archbuild32'
- makechrootpkg_args+=('-d /var/cache/archbuild32')
+ cache_dir='-c/var/cache/archbuild32'
+ makechrootpkg_args+=('-d/var/cache/archbuild32')
fi
+# Pass all arguments after -- right to makepkg
+makechrootpkg_args+=("${@:$OPTIND}")
+
if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
msg "Creating chroot for [%s] (%s)..." "${repo}" "${arch}"