summaryrefslogtreecommitdiff
path: root/archbuild.in
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-06-16 17:17:19 +0200
committerErich Eckner <git@eckner.net>2020-02-19 09:39:54 +0100
commit49d5b6449453d21e7094b41dee496421fb9c0204 (patch)
tree970a72ab8074c926a8947b12a35c2dc233b4911b /archbuild.in
parent0f72b1c9ef81771c327e1ce1c443e88588587770 (diff)
downloaddevtools32-49d5b6449453d21e7094b41dee496421fb9c0204.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
Diffstat (limited to 'archbuild.in')
-rw-r--r--archbuild.in10
1 files changed, 10 insertions, 0 deletions
diff --git a/archbuild.in b/archbuild.in
index 32f0d03..b2a3ebd 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -50,6 +50,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}")
@@ -72,6 +80,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
setarch "${arch}" mkarchroot \
-C "${pacman_config}" \
-M "${makepkg_config}" \
+ ${cache_dir} \
"${chroots}/${repo}-${arch}/root" \
"${base_packages[@]}" || abort
else
@@ -79,6 +88,7 @@ else
arch-nspawn \
-C "${pacman_config}" \
-M "${makepkg_config}" \
+ ${cache_dir} \
"${chroots}/${repo}-${arch}/root" \
pacman -Syuu --noconfirm || abort
fi