From 4b4a02c2851f72ffde21855486746ae6fd84bb29 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 16 Jun 2017 17:17:19 +0200
Subject: 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

---
 archbuild.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'archbuild.in')

diff --git a/archbuild.in b/archbuild.in
index 69bb029..fb6283d 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -50,6 +50,14 @@ done
 
 check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME
 
+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
-- 
cgit v1.2.3-70-g09d2