All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laszlo Ersek <lersek@redhat.com>
To: qemu devel list <qemu-devel@nongnu.org>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 02/10] roms/efirom, tests/uefi-test-tools: update edk2's own submodules first
Date: Tue,  8 Sep 2020 09:29:31 +0200	[thread overview]
Message-ID: <20200908072939.30178-3-lersek@redhat.com> (raw)
In-Reply-To: <20200908072939.30178-1-lersek@redhat.com>

In edk2 commit 06033f5abad3 ("BaseTools: Make brotli a submodule",
2020-04-16), part of edk2-stable202005, the Brotli compressor /
decompressor source code that edk2 had flattened into BaseTools was
replaced with a git submodule.

This means we have to initialize edk2's own submodules before building
BaseTools not just in "roms/Makefile.edk2", but in "roms/Makefile" (for
the sake of the "efirom" target) and "tests/uefi-test-tools/Makefile" as
well.

Right now this patch is effectively a no-op; it will become meaningful
after we move the edk2 submodule to edk2-stable202008.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugs.launchpad.net/qemu/+bug/1852196
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 roms/Makefile                  | 1 +
 tests/uefi-test-tools/Makefile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/roms/Makefile b/roms/Makefile
index 5d9f15b6777f..c594d98f7094 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -140,6 +140,7 @@ build-efi-roms: build-pxe-roms
 #    efirom
 #
 edk2-basetools:
+	cd edk2/BaseTools && git submodule update --init --force
 	$(MAKE) -C edk2/BaseTools \
 		PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \
 		EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
index 1dcddcdbbabf..471f0de98109 100644
--- a/tests/uefi-test-tools/Makefile
+++ b/tests/uefi-test-tools/Makefile
@@ -99,6 +99,7 @@ Build/bios-tables-test.%.efi: build-edk2-tools
 	+./build.sh $(edk2_dir) BiosTablesTest $* $@
 
 build-edk2-tools:
+	cd $(edk2_dir)/BaseTools && git submodule update --init --force
 	$(MAKE) -C $(edk2_dir)/BaseTools \
 		PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \
 		EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
-- 
2.19.1.3.g30247aa5d201



  parent reply	other threads:[~2020-09-08  7:30 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-08  7:29 [PATCH 00/10] edk2: adopt the edk2-stable202008 release Laszlo Ersek
2020-09-08  7:29 ` [PATCH 01/10] Makefile: remove obsolete edk2 exception from "clean" rule Laszlo Ersek
2020-09-08  8:13   ` Philippe Mathieu-Daudé
2020-09-08  7:29 ` Laszlo Ersek [this message]
2020-09-08  7:29 ` [PATCH 03/10] roms/Makefile.edk2: prepare for replacing TPM2*_ENABLE macros Laszlo Ersek
2020-09-08  8:09   ` Philippe Mathieu-Daudé
2020-09-08  7:29 ` [PATCH 04/10] tests: acpi: tolerate "virt/SSDT.memhp" mismatch temporarily Laszlo Ersek
2020-09-08  8:56   ` Igor Mammedov
2020-09-08 12:02   ` Michael S. Tsirkin
2020-09-08  7:29 ` [PATCH 05/10] roms/edk2: update submodule from edk2-stable201905 to edk2-stable202008 Laszlo Ersek
2020-09-08  8:22   ` Philippe Mathieu-Daudé
2020-09-08 12:08     ` Laszlo Ersek
2020-09-10 15:32       ` Philippe Mathieu-Daudé
2020-09-10 15:44         ` Laszlo Ersek
2020-09-10 16:00           ` Philippe Mathieu-Daudé
2020-09-10 16:14             ` Laszlo Ersek
2020-09-08  7:29 ` [PATCH 06/10] roms/Makefile.edk2: complete replacing TPM2*_ENABLE macros Laszlo Ersek
2020-09-08  8:10   ` Philippe Mathieu-Daudé
2020-09-08  7:29 ` [PATCH 07/10] roms/Makefile.edk2: enable new ARM/AARCH64 flags up to edk2-stable202008 Laszlo Ersek
2020-09-08  8:11   ` Philippe Mathieu-Daudé
2020-09-08  7:29 ` [PATCH 08/10] pc-bios: refresh edk2 build artifacts for edk2-stable202008 Laszlo Ersek
2020-09-10 16:32   ` Philippe Mathieu-Daudé
2020-09-10 16:40     ` Daniel P. Berrangé
2020-09-10 17:16     ` Laszlo Ersek
2020-09-14  9:54     ` Gerd Hoffmann
2020-09-14 10:53       ` Philippe Mathieu-Daudé
2020-09-14 11:40         ` Gerd Hoffmann
2020-09-08  7:29 ` [PATCH 09/10] pc-bios: update the README file with edk2-stable202008 information Laszlo Ersek
2020-09-10 16:03   ` Philippe Mathieu-Daudé
2020-09-08  7:29 ` [PATCH 10/10] tests: acpi: update "virt/SSDT.memhp" for edk2-stable202008 Laszlo Ersek
2020-09-08  8:27   ` Philippe Mathieu-Daudé
2020-09-08 12:14     ` Laszlo Ersek
2020-09-10 16:02       ` Philippe Mathieu-Daudé
2020-09-08  8:56   ` Igor Mammedov
2020-09-08 12:03   ` Michael S. Tsirkin
2020-09-10 19:31 ` [PATCH 00/10] edk2: adopt the edk2-stable202008 release Philippe Mathieu-Daudé
2020-09-11  7:12   ` Laszlo Ersek

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=20200908072939.30178-3-lersek@redhat.com \
    --to=lersek@redhat.com \
    --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 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.