diff options
| author | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-05-31 16:09:42 +0200 |
| commit | 52b58b0f8e1a4ccde39b6ce1f41167d8a22d093f (patch) | |
| tree | c1514bab60a3d1e6d1504c05c839636aece8f62f /archbuild.in | |
| parent | 70e938432e7042e9e6be49294e85c3a2e89c7603 (diff) | |
| download | devtools32-52b58b0f8e1a4ccde39b6ce1f41167d8a22d093f.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 0ac3c29..0a84687 100644 --- a/archbuild.in +++ b/archbuild.in @@ -41,6 +41,14 @@ done check_root SOURCE_DATE_EPOCH +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}") @@ -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 |