diff options
| author | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-04-02 11:16:21 +0200 |
| commit | 3a9453e307bf1ff80a140ec8022a2bd57fc4c3fa (patch) | |
| tree | 276a82a1853345cd09c35d3c48678312d828a82b | |
| parent | ab2cfe0b9e80206985ab6071f4578530f174f49f (diff) | |
| download | devtools32-3a9453e307bf1ff80a140ec8022a2bd57fc4c3fa.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 31c6317..1b223c4 100644 --- a/archbuild.in +++ b/archbuild.in @@ -47,6 +47,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}") @@ -69,6 +77,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then setarch "${arch}" mkarchroot \ -C "@pkgdatadir@/pacman-${repo}${arch_ext}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ + ${cache_dir} \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" || abort else @@ -76,6 +85,7 @@ else arch-nspawn \ -C "@pkgdatadir@/pacman-${repo}${arch_ext}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ + ${cache_dir} \ "${chroots}/${repo}-${arch}/root" \ pacman -Syu --noconfirm || abort fi |