summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-06-16 17:17:19 +0200
committerErich Eckner <git@eckner.net>2022-12-08 12:57:22 +0100
commit0a285ac926aa1f9238d60b6a2bbd3155e3d84fd4 (patch)
treed2f7829d90fee73627757d3630fd8384404e6d3a
parent09a608f7b20da05dee48c60e8c0e809d03dab93e (diff)
downloaddevtools-0a285ac926aa1f9238d60b6a2bbd3155e3d84fd4.tar.xz
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
-rw-r--r--src/archbuild.in10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/archbuild.in b/src/archbuild.in
index ad7036e..72d8005 100644
--- a/src/archbuild.in
+++ b/src/archbuild.in
@@ -56,6 +56,14 @@ done
check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME,PKGEXT
+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:/var/cache/pacman/pkg')
+fi
+
# Pass all arguments after -- right to makepkg
makechrootpkg_args+=("${@:$OPTIND}")
@@ -78,6 +86,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
setarch "${set_arch}" mkarchroot \
-C "${pacman_config}" \
-M "${makepkg_config}" \
+ ${cache_dir} \
"${chroots}/${repo}-${arch}/root" \
"${base_packages[@]}" || abort
else
@@ -85,6 +94,7 @@ else
arch-nspawn \
-C "${pacman_config}" \
-M "${makepkg_config}" \
+ ${cache_dir} \
"${chroots}/${repo}-${arch}/root" \
pacman -Syuu --noconfirm || abort
fi