diff options
author | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2019-09-13 09:22:11 +0200 |
commit | 5abdb479663b8635d46263b606f54ddbfdf034f1 (patch) | |
tree | a1cb58f796bf42990796a43238b2f98e381ac534 | |
parent | d97f555815810e24c03278f3c8e2e08e93b7b217 (diff) | |
download | devtools32-5abdb479663b8635d46263b606f54ddbfdf034f1.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-- | archbuild.in | 10 |
1 files changed, 10 insertions, 0 deletions
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 |