diff options
author | Erich Eckner <git@eckner.net> | 2017-06-22 10:55:51 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2019-01-31 09:59:18 +0100 |
commit | b7309816abe2381b8a216b48e5ad7ef483d7ce28 (patch) | |
tree | 983a3ce9b349edaa37e28f1bdbd215a71756f721 /archbuild.in | |
parent | b855f188d07765aa16fa4e1872bf408269c0d205 (diff) | |
download | devtools32-b7309816abe2381b8a216b48e5ad7ef483d7ce28.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 163a108..31c6317 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 @@ -61,14 +67,14 @@ 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" \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" || abort 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" \ "${chroots}/${repo}-${arch}/root" \ pacman -Syu --noconfirm || abort |