diff options
| author | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-05-16 16:39:44 +0200 |
| commit | e03043eb6235eccaeae49894ce889c79293eb800 (patch) | |
| tree | 08a53ec56f832581d5d3612a7ecbe500556d8e8f | |
| parent | a3425afdd9cb1e90c2c80bcd803e95f9d6ea3c80 (diff) | |
| download | devtools32-e03043eb6235eccaeae49894ce889c79293eb800.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-- | arch-nspawn.in | 3 | ||||
| -rw-r--r-- | archbuild.in | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index 93d3bf7..cf6c236 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -92,6 +92,7 @@ copy_hostconf () { done sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$working_dir/etc/pacman.conf" + eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" sed -i '/^Architecture = /s| auto$| '"$CARCH|" "$working_dir/etc/pacman.conf" } # }}} @@ -108,8 +109,6 @@ fi build_mount_args copy_hostconf -eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" - [[ -z $nosetarch ]] || unset CARCH exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ 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 |