From: Laszlo Ersek <lersek@redhat.com>
To: berrange@redhat.com, eblake@redhat.com, f4bug@amsat.org,
imammedo@redhat.com, kraxel@redhat.com, mprivozn@redhat.com,
mst@redhat.com, peter.maydell@linaro.org, philmd@redhat.com,
qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH for-4.1 v4 06/12] roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools"
Date: Wed, 10 Apr 2019 01:00:16 +0200 [thread overview]
Message-ID: <20190409230022.6462-7-lersek@redhat.com> (raw)
In-Reply-To: <20190409230022.6462-1-lersek@redhat.com>
We don't (can't) have a recipe for building just $(EDK2_EFIROM);
therefore, while we call the target $(EDK2_EFIROM), we actually build all
of the edk2 BaseTools. Rename the target to edk2-basetools, and update the
iPXE prerequisite accordingly. This will let other targets depend on
"edk2-basetools", where an $(EDK2_EFIROM) pre-requisite would be
misleading.
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
Notes:
v4:
- rebase: resolve conflicts with
- commit d912e795e029 ("roms: Rename the EFIROM variable to avoid
clashing with iPXE", 2019-04-09)
- commit 1cab464136b4 ("roms: Allow passing configure options to the
EDK2 build tools", 2019-04-09)
- refresh commit message accordingly: replace EFIROM references with
EDK2_EFIROM references
- drop all previous feedback tags, consequently :(
- Phil's R-b / T-b
- Michal's R-b
- Michael's R-b
- Igor's T-b
v3:
- pick up Igor's T-b
v2:
- pick up Phil's R-b / T-b
- pick up Michal's and Michael's R-b's
roms/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roms/Makefile b/roms/Makefile
index 1ff78b63bb3a..93c3d467be14 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -102,7 +102,7 @@ pxe-rom-%: build-pxe-roms
efirom: $(patsubst %,efi-rom-%,$(pxerom_variants))
-efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM)
+efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools
$(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \
-b ipxe/src/bin/$(VID)$(DID).rom \
-ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \
@@ -131,7 +131,7 @@ build-efi-roms: build-pxe-roms
# EDK2_BASETOOLS_LDFLAGS='...' \
# efirom
#
-$(EDK2_EFIROM):
+edk2-basetools:
$(MAKE) -C edk2/BaseTools \
EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'
--
2.19.1.3.g30247aa5d201
next prev parent reply other threads:[~2019-04-09 23:01 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 23:00 [Qemu-devel] [PATCH for-4.1 v4 00/12] bundle edk2 platform firmware with QEMU Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 01/12] roms: lift "edk2-funcs.sh" from "tests/uefi-test-tools/build.sh" Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 02/12] roms/edk2-funcs.sh: require gcc-4.8+ for building i386 and x86_64 Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 03/12] tests/uefi-test-tools/build.sh: work around TianoCore#1607 Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 04/12] roms/edk2: advance to tag edk2-stable201903 Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 05/12] roms/edk2-funcs.sh: add the qemu_edk2_get_thread_count() function Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek [this message]
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 06/12] roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools" Laszlo Ersek
2019-04-10 5:04 ` Philippe Mathieu-Daudé
2019-04-10 5:04 ` Philippe Mathieu-Daudé
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 07/12] roms: build edk2 firmware binaries and variable store templates Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-10 5:18 ` Philippe Mathieu-Daudé
2019-04-10 5:18 ` Philippe Mathieu-Daudé
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 08/12] pc-bios: add " Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-10 10:19 ` Philippe Mathieu-Daudé
2019-04-10 10:19 ` Philippe Mathieu-Daudé
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 09/12] pc-bios: document the edk2 firmware images; add firmware descriptors Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-10 5:14 ` Philippe Mathieu-Daudé
2019-04-10 5:14 ` Philippe Mathieu-Daudé
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 10/12] tests: add missing dependency to build QTEST_QEMU_BINARY, round 2 Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-10 10:26 ` Philippe Mathieu-Daudé
2019-04-10 10:26 ` Philippe Mathieu-Daudé
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 11/12] Makefile: install the edk2 firmware images and their descriptors Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-10 10:18 ` Philippe Mathieu-Daudé
2019-04-10 10:18 ` Philippe Mathieu-Daudé
2019-04-09 23:00 ` [Qemu-devel] [PATCH for-4.1 v4 12/12] MAINTAINERS: add the "EDK2 Firmware" subsystem Laszlo Ersek
2019-04-09 23:00 ` Laszlo Ersek
2019-04-09 23:15 ` [Qemu-devel] [PATCH for-4.1 v4 00/12] bundle edk2 platform firmware with QEMU Michael S. Tsirkin
2019-04-09 23:15 ` Michael S. Tsirkin
2019-04-10 9:12 ` Igor Mammedov
2019-04-10 9:12 ` Igor Mammedov
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=20190409230022.6462-7-lersek@redhat.com \
--to=lersek@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=f4bug@amsat.org \
--cc=imammedo@redhat.com \
--cc=kraxel@redhat.com \
--cc=mprivozn@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.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 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).