diff options
| author | Erich Eckner <git@eckner.net> | 2017-06-22 10:55:51 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-05-16 16:39:44 +0200 |
| commit | 29dc131967a3361b2846108415d90e27f30823ed (patch) | |
| tree | 1c94d6b9c17446ce979fd6e85dc1540edf4082de /archbuild.in | |
| parent | e03043eb6235eccaeae49894ce889c79293eb800 (diff) | |
| download | devtools-29dc131967a3361b2846108415d90e27f30823ed.tar.xz | |
separate mirrorlist for i686 and x86_64
Diffstat (limited to 'archbuild.in')
| -rw-r--r-- | archbuild.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/archbuild.in b/archbuild.in index 0a84687..4194b68 100644 --- a/archbuild.in +++ b/archbuild.in @@ -11,11 +11,17 @@ cmd="${0##*/}" if [[ "${cmd%%-*}" == 'multilib' ]]; then repo="${cmd%-build}" arch='x86_64' + arch_ext='' base_packages+=(multilib-devel) else tag="${cmd%-build}" repo=${tag%-*} arch=${tag##*-} + if [ "${arch}" = 'x86_64' ]; then + arch_ext='' + else + arch_ext="-${arch}" + fi fi chroots='/var/lib/archbuild' clean_first=false @@ -69,7 +75,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf --one-file-system "${chroots}/${repo}-${arch}" mkdir -p "${chroots}/${repo}-${arch}" setarch "${arch}" mkarchroot \ - -C "@pkgdatadir@/pacman-${repo}.conf" \ + -C "@pkgdatadir@/pacman-${repo}${arch_ext}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ ${cache_dir} \ "${chroots}/${repo}-${arch}/root" \ @@ -77,7 +83,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then else lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot" arch-nspawn \ - -C "@pkgdatadir@/pacman-${repo}.conf" \ + -C "@pkgdatadir@/pacman-${repo}${arch_ext}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ ${cache_dir} \ "${chroots}/${repo}-${arch}/root" \ |