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>2018-03-24 21:36:02 +0100
commit55108adfb006ae8833aad7553ea6e6825fa96b36 (patch)
tree9f8b02d8b0931f2350b2d9925ba9d6bceee3ede2 /archbuild.in
parente0e74e36b1eac33c9206e2654b17b16723cd3e22 (diff)
downloaddevtools32-55108adfb006ae8833aad7553ea6e6825fa96b36.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 0ac3c29..0a84687 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -41,6 +41,14 @@ done
check_root SOURCE_DATE_EPOCH
+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}")
@@ -63,6 +71,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
setarch "${arch}" mkarchroot \
-C "@pkgdatadir@/pacman-${repo}.conf" \
-M "@pkgdatadir@/makepkg-${arch}.conf" \
+ ${cache_dir} \
"${chroots}/${repo}-${arch}/root" \
"${base_packages[@]}" || abort
else
@@ -70,6 +79,7 @@ else
arch-nspawn \
-C "@pkgdatadir@/pacman-${repo}.conf" \
-M "@pkgdatadir@/makepkg-${arch}.conf" \
+ ${cache_dir} \
"${chroots}/${repo}-${arch}/root" \
pacman --arch ${arch} -Syu --noconfirm || abort
fi