qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com
Subject: [PATCH 4/5] configure: check for SLOF submodule before building pc-bios/s390-ccw
Date: Sat, 27 May 2023 11:28:50 +0200	[thread overview]
Message-ID: <20230527092851.705884-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20230527092851.705884-1-pbonzini@redhat.com>

SLOF is required for building the s390-ccw firmware on s390x,
since it is using the libnet code from SLOF for network booting.

If SLOF is absent and submodules are not updated, pc-bios/s390-ccw
cannot be built.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 1d1b8736c0eb..c92a3b30b9a4 100755
--- a/configure
+++ b/configure
@@ -1662,7 +1662,8 @@ fi
 
 # Only build s390-ccw bios if the compiler has -march=z900 or -march=z10
 # (which is the lowest architecture level that Clang supports)
-if have_target s390x-softmmu && probe_target_compiler s390x-softmmu; then
+if have_target s390x-softmmu && probe_target_compiler s390x-softmmu && \
+    ( test "$git_submodules_action" != ignore || test -f roms/SLOF/VERSION ); then
   write_c_skeleton
   do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC
   has_z900=$?
-- 
2.40.1



  parent reply	other threads:[~2023-05-27  9:30 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-27  9:28 [PATCH 0/5] meson: replace submodules with wrap files Paolo Bonzini
2023-05-27  9:28 ` [PATCH 1/5] configure: remove --with-git= option Paolo Bonzini
2023-05-30 11:58   ` Thomas Huth
2023-05-30 12:03     ` Paolo Bonzini
2023-05-30 12:17       ` Daniel P. Berrangé
2023-05-30 12:18   ` Daniel P. Berrangé
2023-05-27  9:28 ` [PATCH 2/5] configure: rename --enable-pypi to --enable-download, control subprojects too Paolo Bonzini
2023-05-27 16:49   ` BALATON Zoltan
2023-05-27 19:18     ` Paolo Bonzini
2023-05-30 12:00   ` Thomas Huth
2023-05-27  9:28 ` [PATCH 3/5] meson: subprojects: replace submodules with wrap files Paolo Bonzini
2023-05-30 12:23   ` Daniel P. Berrangé
2023-05-30 12:51     ` Paolo Bonzini
2023-05-30 12:54       ` Daniel P. Berrangé
2023-05-27  9:28 ` Paolo Bonzini [this message]
2023-05-30 12:04   ` [PATCH 4/5] configure: check for SLOF submodule before building pc-bios/s390-ccw Thomas Huth
2023-05-30 12:53     ` Paolo Bonzini
2023-05-30 13:00       ` Thomas Huth
2023-05-27  9:28 ` [PATCH 5/5] meson: subprojects: replace berkeley-{soft, test}float-3 with wraps Paolo Bonzini
2023-05-30 12:18 ` [PATCH 0/5] meson: replace submodules with wrap files Thomas Huth
2023-05-30 12:57   ` Daniel P. Berrangé
2023-05-30 13:22     ` Paolo Bonzini
2023-05-30 12:30 ` Daniel P. Berrangé
2023-05-30 12:47   ` Paolo Bonzini

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=20230527092851.705884-5-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=berrange@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).