diff options
| author | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-05-18 08:45:02 +0200 |
| commit | 360f258283e68b54647e4c98ce57d0f625fb199b (patch) | |
| tree | bedf1195fa6d6b0d302a17d7042a0334a65ba661 /archbuild.in | |
| parent | 9afbfd02260aaea3996f204498f23dafcc4cf422 (diff) | |
| download | devtools32-360f258283e68b54647e4c98ce57d0f625fb199b.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.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/archbuild.in b/archbuild.in index 7cd65bd..e1f2fc2 100644 --- a/archbuild.in +++ b/archbuild.in @@ -55,6 +55,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}") @@ -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 |