diff options
| author | Erich Eckner <git@eckner.net> | 2017-06-22 10:55:51 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-06-22 10:55:51 +0200 |
| commit | b951a9902d36c3ff0d54141dfb32f0c9fa988dc9 (patch) | |
| tree | 62f8e229fde20cc296425949f61059e7d24f909c /archbuild.in | |
| parent | 0e8a0807547251e08560a213e7f940c16b4025be (diff) | |
| download | devtools32-b951a9902d36c3ff0d54141dfb32f0c9fa988dc9.tar.xz | |
separate mirrorlist for i686 and x86_64
Diffstat (limited to 'archbuild.in')
| -rw-r--r-- | archbuild.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/archbuild.in b/archbuild.in index 0ed88e6..e593156 100644 --- a/archbuild.in +++ b/archbuild.in @@ -11,11 +11,13 @@ 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##*-} + arch_ext="-${arch}" fi chroots='/var/lib/archbuild' clean_first=false @@ -69,7 +71,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 +79,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" \ |