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>2021-02-13 14:15:06 +0100
commit3344d8b0762eb9dab551e8d77f035f3e1a10ec4d (patch)
treeec7c0b1f35b485963a846642cb30efa14b1e1e2c /archbuild.in
parent342f1632fb8c44034c4fa4ecf5caf19b1d1befd2 (diff)
downloaddevtools-3344d8b0762eb9dab551e8d77f035f3e1a10ec4d.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 d530629..e7733c8 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -55,6 +55,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}")
@@ -77,6 +85,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
@@ -84,6 +93,7 @@ else
arch-nspawn \
-C "${pacman_config}" \
-M "${makepkg_config}" \
+ ${cache_dir} \
"${chroots}/${repo}-${arch}/root" \
pacman -Syuu --noconfirm || abort
fi