diff options
| author | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
| commit | 6d847f9c794f13515102e6d564c7d7336663c1a6 (patch) | |
| tree | f37e975cb469985dd122659b1da1b58fe7ed4221 | |
| parent | a896d7653218127753f6e4c57d15a13aac50ba99 (diff) | |
| download | devtools-6d847f9c794f13515102e6d564c7d7336663c1a6.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
| -rw-r--r-- | archbuild.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/archbuild.in b/archbuild.in index dc2e561..4c51195 100644 --- a/archbuild.in +++ b/archbuild.in @@ -44,6 +44,14 @@ check_root # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") +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') +fi + if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then msg "Creating chroot for [%s] (%s)..." "${repo}" "${arch}" @@ -63,6 +71,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then setarch "${arch}" mkarchroot \ -C "@pkgdatadir@/pacman-${repo}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ + ${cache_dir} \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" || abort else @@ -70,6 +79,7 @@ else arch-nspawn \ -C "@pkgdatadir@/pacman-${repo}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ + ${cache_dir} \ "${chroots}/${repo}-${arch}/root" \ pacman --arch ${arch} -Syu --noconfirm || abort fi |