summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-13 14:32:36 +0200
committerErich Eckner <git@eckner.net>2019-08-22 11:18:40 +0200
commit4e9fba2f676acf79879673a7864a8ec692f489b9 (patch)
treefba9bb392d1b4812c14d409107942381824c0c61
parent7027e90c3283fedd42cca885b092e68a3cc15950 (diff)
downloaddevtools32-4e9fba2f676acf79879673a7864a8ec692f489b9.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.in7
-rw-r--r--archbuild.in7
2 files changed, 12 insertions, 2 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index a552dea..f0899c0 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -131,8 +131,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 fb6283d..aed79f3 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}"
mkdir -m755 -p "${chroots}/${repo}-${arch}"
- setarch "${arch}" mkarchroot \
+ setarch "${set_arch}" mkarchroot \
-C "${pacman_config}" \
-M "${makepkg_config}" \
${cache_dir} \