From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Doug Goldstein <cardoe@cardoe.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Anthony PERARD <anthony.perard@citrix.com>,
Michal Orzel <michal.orzel@amd.com>,
Oleksii Kurochko <oleksii.kurochko@gmail.com>
Subject: [PATCH 6/6] CI: Simplify the MUSL check
Date: Fri, 30 Dec 2022 00:38:48 +0000 [thread overview]
Message-ID: <20221230003848.3241-7-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <20221230003848.3241-1-andrew.cooper3@citrix.com>
There's no need to do ad-hoc string parsing. Use grep -q instead.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Anthony PERARD <anthony.perard@citrix.com>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
automation/scripts/build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/automation/scripts/build b/automation/scripts/build
index 206312ecc7d0..f2f5e55bc04f 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -65,7 +65,7 @@ else
cfgargs+=("--disable-stubdom")
fi
- if ! test -z "$(ldd /bin/ls|grep musl|head -1)"; then
+ if ldd /bin/ls | grep -q musl; then
# disable --disable-werror for QEMUU when building with MUSL
cfgargs+=("--with-extra-qemuu-configure-args=\"--disable-werror\"")
# SeaBIOS doesn't build on MUSL systems
--
2.11.0
next prev parent reply other threads:[~2022-12-30 0:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 0:38 [PATCH 0/6] CI: Fixes/cleanup in preparation for RISCV Andrew Cooper
2022-12-30 0:38 ` [PATCH 1/6] CI: Drop automation/configs/ Andrew Cooper
2023-01-02 13:57 ` Michal Orzel
2023-01-04 1:08 ` Stefano Stabellini
2022-12-30 0:38 ` [PATCH 2/6] CI: Remove guesswork about which artefacts to preserve Andrew Cooper
2023-01-02 14:00 ` Michal Orzel
2023-01-04 12:12 ` Andrew Cooper
2023-01-04 12:18 ` Michal Orzel
2023-01-04 1:10 ` Stefano Stabellini
2023-01-04 1:18 ` Andrew Cooper
2023-01-04 1:22 ` Stefano Stabellini
2022-12-30 0:38 ` [PATCH 3/6] CI: Only calculate ./configure args if needed Andrew Cooper
2023-01-02 14:01 ` Michal Orzel
2023-01-04 1:12 ` Stefano Stabellini
2022-12-30 0:38 ` [PATCH 4/6] CI: Express HYPERVISOR_ONLY in build.yml Andrew Cooper
2022-12-30 10:04 ` Oleksii
2023-01-02 14:05 ` Michal Orzel
2023-01-04 1:15 ` Stefano Stabellini
2023-01-04 1:27 ` Andrew Cooper
2023-01-04 1:36 ` Stefano Stabellini
2023-01-04 1:41 ` Andrew Cooper
2023-01-04 1:48 ` Stefano Stabellini
2023-01-04 1:51 ` Andrew Cooper
2023-01-04 1:55 ` Stefano Stabellini
2022-12-30 0:38 ` [PATCH 5/6] CI: Fix build script when CROSS_COMPILE is in use Andrew Cooper
2023-01-04 1:20 ` Stefano Stabellini
2022-12-30 0:38 ` Andrew Cooper [this message]
2023-01-04 1:22 ` [PATCH 6/6] CI: Simplify the MUSL check Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221230003848.3241-7-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=anthony.perard@citrix.com \
--cc=cardoe@cardoe.com \
--cc=michal.orzel@amd.com \
--cc=oleksii.kurochko@gmail.com \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.