diff options
author | Erich Eckner <git@eckner.net> | 2019-04-13 14:32:36 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2019-04-13 14:32:36 +0200 |
commit | 15fd0a4b63103eb9c00346b8d233f9e6bc8122d3 (patch) | |
tree | a199eccd5946e005085a2fa46820ea177b9f5504 /archbuild.in | |
parent | 51d72adfc5be558c295b313927fa089011827c0c (diff) | |
download | devtools32-15fd0a4b63103eb9c00346b8d233f9e6bc8122d3.tar.xz |
make arch-nspawn and archbuild compatible with pentium4v20190414
pentium4 is unknown to setarch - we must replace it by i686 if used as argument to setarch
Diffstat (limited to 'archbuild.in')
-rw-r--r-- | archbuild.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/archbuild.in b/archbuild.in index 1b223c4..4b97963 100644 --- a/archbuild.in +++ b/archbuild.in @@ -23,6 +23,11 @@ else arch_ext="-${arch}" fi fi +if [[ "${arch}" == 'pentium4' ]]; then + set_arch='i686' +else + set_arch="${arch}" +fi chroots='/var/lib/archbuild' clean_first=false @@ -74,7 +79,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 \ + setarch "${set_arch}" mkarchroot \ -C "@pkgdatadir@/pacman-${repo}${arch_ext}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ ${cache_dir} \ |