From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com, berrange@redhat.com
Subject: [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader
Date: Mon, 5 Jun 2023 11:52:20 +0200 [thread overview]
Message-ID: <20230605095223.107653-8-pbonzini@redhat.com> (raw)
In-Reply-To: <20230605095223.107653-1-pbonzini@redhat.com>
In the beginning, the network bootloader was considered experimental and
thus optional, but it is well established nowadays and configure always
checks for roms/SLOF before compiling pc-bios/s390-ccw.
Therefore, it makes sense to always build it together with the other
part of the s390-ccw bios.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
pc-bios/s390-ccw/Makefile | 5 -----
1 file changed, 5 deletions(-)
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 9c5276f8ade..2e8cc015aa0 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -67,12 +67,7 @@ s390-ccw.img: s390-ccw.elf
$(OBJECTS): Makefile
-ifneq ($(wildcard $(SRC_PATH)/../../roms/SLOF/lib/libnet),)
include $(SRC_PATH)/netboot.mak
-else
-s390-netboot.img:
- @echo "s390-netboot.img not built since roms/SLOF/ is not available."
-endif
ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
-include $(ALL_OBJS:%.o=%.d)
--
2.40.1
next prev parent reply other threads:[~2023-06-05 9:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-05 9:52 [PATCH v2 00/10] meson: replace submodules with wrap files Paolo Bonzini
2023-06-05 9:52 ` [PATCH 01/10] configure: remove --with-git= option Paolo Bonzini
2023-06-05 10:27 ` Alex Bennée
2023-06-05 11:17 ` Thomas Huth
2023-06-05 9:52 ` [PATCH 02/10] configure: rename --enable-pypi to --enable-download, control subprojects too Paolo Bonzini
2023-06-05 10:28 ` Alex Bennée
2023-06-05 9:52 ` [PATCH 03/10] git-submodule: allow partial update of .git-submodule-status Paolo Bonzini
2023-06-05 10:55 ` Alex Bennée
2023-06-05 9:52 ` [PATCH 04/10] build: log submodule update from git-submodule.sh Paolo Bonzini
2023-06-05 10:56 ` Alex Bennée
2023-06-05 11:11 ` Alex Bennée
2023-06-05 9:52 ` [PATCH 05/10] meson: subprojects: replace submodules with wrap files Paolo Bonzini
2023-06-06 9:54 ` Daniel P. Berrangé
2023-06-05 9:52 ` [PATCH 06/10] configure: move SLOF submodule handling to pc-bios/s390-ccw Paolo Bonzini
2023-06-06 9:56 ` Daniel P. Berrangé
2023-06-06 10:07 ` Thomas Huth
2023-06-05 9:52 ` Paolo Bonzini [this message]
2023-06-06 9:56 ` [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader Daniel P. Berrangé
2023-06-06 10:08 ` Thomas Huth
2023-06-16 15:20 ` Nina Schoetterl-Glausch
2023-06-22 8:42 ` Thomas Huth
2023-06-22 9:47 ` Paolo Bonzini
2023-06-05 9:52 ` [PATCH 08/10] meson: subprojects: replace berkeley-{soft, test}float-3 with wraps Paolo Bonzini
2023-06-06 9:58 ` [PATCH 08/10] meson: subprojects: replace berkeley-{soft,test}float-3 " Daniel P. Berrangé
2023-06-05 9:52 ` [PATCH 09/10] build: remove git submodule handling from main makefile Paolo Bonzini
2023-06-06 9:59 ` Daniel P. Berrangé
2023-06-05 9:52 ` [PATCH 10/10] configure: remove --with-git-submodules= Paolo Bonzini
2023-06-06 10:00 ` Daniel P. Berrangé
2023-06-07 7:41 ` [PATCH v2 00/10] meson: replace submodules with wrap files Michal Prívozník
2023-06-07 7:47 ` Daniel P. Berrangé
2023-06-07 8:54 ` Michal Prívozník
2023-06-07 8:56 ` 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=20230605095223.107653-8-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=berrange@redhat.com \
--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).