From: Laszlo Ersek <lersek@redhat.com>
To: Michael Roth <mdroth@linux.vnet.ibm.com>, qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org, brogers@suse.com
Subject: Re: [Qemu-devel] [PATCH 2/2] roms/Makefile.edk2: don't pull in submodules when building from tarball
Date: Fri, 13 Sep 2019 14:33:17 +0200 [thread overview]
Message-ID: <beecc252-41af-ba15-651a-adfb2ebbd4a3@redhat.com> (raw)
In-Reply-To: <20190912231202.12327-3-mdroth@linux.vnet.ibm.com>
On 09/13/19 01:12, Michael Roth wrote:
> Currently the `make efi` target pulls submodules nested under the
> roms/edk2 submodule as dependencies. However, when we attempt to build
> from a tarball this fails since we are no longer in a git tree.
>
> A preceding patch will pre-populate these submodules in the tarball,
> so assume this build dependency is only needed when building from a
> git tree.
>
> Reported-by: Bruce Rogers <brogers@suse.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Bruce Rogers <brogers@suse.com>
> Cc: qemu-stable@nongnu.org # v4.1.0
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
> roms/Makefile.edk2 | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
> index c2f2ff59d5..33a074d3a4 100644
> --- a/roms/Makefile.edk2
> +++ b/roms/Makefile.edk2
> @@ -46,8 +46,13 @@ all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \
> # files.
> .INTERMEDIATE: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd)
>
> +# Fetch edk2 submodule's submodules. If it is not in a git tree, assume
> +# we're building from a tarball and that they've already been fetched by
> +# make-release/tarball scripts.
> submodules:
> - cd edk2 && git submodule update --init --force
> + if test -d edk2/.git; then \
> + cd edk2 && git submodule update --init --force; \
> + fi
>
> # See notes on the ".NOTPARALLEL" target and the "+" indicator in
> # "tests/uefi-test-tools/Makefile".
>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thank you,
Laszlo
next prev parent reply other threads:[~2019-09-13 12:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 23:12 [Qemu-devel] [PATCH 0/2] Fix tarball builds of UEFI/EDK2 firmware Michael Roth
2019-09-12 23:12 ` [Qemu-devel] [PATCH 1/2] make-release: pull in edk2 submodules so we can build it from tarballs Michael Roth
2019-09-12 23:12 ` [Qemu-devel] [PATCH 2/2] roms/Makefile.edk2: don't pull in submodules when building from tarball Michael Roth
2019-09-13 12:33 ` Laszlo Ersek [this message]
2019-09-20 19:50 ` Philippe Mathieu-Daudé
2019-09-24 20:47 ` Laszlo Ersek
2019-09-19 13:51 ` [Qemu-devel] [PATCH 0/2] Fix tarball builds of UEFI/EDK2 firmware Philippe Mathieu-Daudé
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=beecc252-41af-ba15-651a-adfb2ebbd4a3@redhat.com \
--to=lersek@redhat.com \
--cc=brogers@suse.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@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).