diff options
| author | Erich Eckner <git@eckner.net> | 2019-04-13 14:32:36 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-11-30 22:09:39 +0100 |
| commit | edefa5edbec227ab988f651f6b66fa0fef27cd0f (patch) | |
| tree | 7a6ebfc44c94d587ea51f51f312a86c0eed3135a | |
| parent | eeb0917568342f3a1233062fb63c600ac32fab96 (diff) | |
| download | devtools-edefa5edbec227ab988f651f6b66fa0fef27cd0f.tar.xz | |
make arch-nspawn and archbuild compatible with pentium4
pentium4 is unknown to setarch - we must replace it by i686 if used as argument to setarch
| -rw-r--r-- | arch-nspawn.in | 7 | ||||
| -rw-r--r-- | archbuild.in | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index 08f24b7..5d8b3d1 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -126,8 +126,13 @@ copy_hostconf eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" [[ -z $nosetarch ]] || unset CARCH +if [[ "${CARCH}" = 'pentium4' ]]; then + set_arch='i686' +else + set_arch="${CARCH}" +fi -exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ +exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \ -D "$working_dir" \ -E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \ --register=no --keep-unit --as-pid2 \ diff --git a/archbuild.in b/archbuild.in index 83f4695..409bf97 100644 --- a/archbuild.in +++ b/archbuild.in @@ -17,6 +17,11 @@ else repo=${tag%-*} arch=${tag##*-} fi +if [[ "${arch}" == 'pentium4' ]]; then + set_arch='i686' +else + set_arch="${arch}" +fi chroots='/var/lib/archbuild' clean_first=false @@ -77,7 +82,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf --one-file-system "${chroots}/${repo}-${arch}" (umask 0022; mkdir -p "${chroots}/${repo}-${arch}") - setarch "${arch}" mkarchroot \ + setarch "${set_arch}" mkarchroot \ -C "${pacman_config}" \ -M "${makepkg_config}" \ ${cache_dir} \ |