From cf6e6f14d3e9c9992d173153dbaf7164c92262ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 10 Feb 2020 13:59:34 +0700 Subject: [PATCH] wrappers/uname: report correct machine type on ethereal We're using Ethereal chroot style on Travis CI. In that chroot style, `uname -m` reports x86_64 even if we're bootstrapped with i686 systems. Some i686 build that employ `uname -m` is failing on Travis CI, e.g: https://travis-ci.org/void-linux/void-packages/jobs/648010517#L5787 Change `uname` output to make Travis Output meaningful for i686. --- common/wrappers/uname.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/wrappers/uname.sh b/common/wrappers/uname.sh index 7145de3749c..1f1846999eb 100644 --- a/common/wrappers/uname.sh +++ b/common/wrappers/uname.sh @@ -2,5 +2,8 @@ uname=$(/usr/bin/uname $@) rv=$? -echo "$uname" | sed "s/\(^\| \)$(/usr/bin/uname -n)\($\| \)/\1void\2/" +echo "$uname" | + sed "s/\(^\| \)$(/usr/bin/uname -n)\($\| \)/\1void\2/" | + sed "s/$(/usr/bin/uname -m)/${XBPS_ARCH%-musl}/" + exit $rv