diff options
| author | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-12-12 08:09:01 +0100 |
| commit | 9def927a2b8c27bc41c323351b15d632a322b3ba (patch) | |
| tree | b443da910bc74e25b7017b4d6098cab25f5d75be | |
| parent | 0a52f822a8073ebc615b2d3b19734202b79719c6 (diff) | |
| download | devtools-9def927a2b8c27bc41c323351b15d632a322b3ba.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 5b98976..83f4695 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 |