[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen staging-4.13] roms/Makefile.edk2: don't pull in submodules when building from tarball

commit fc5afb1a9230fe21d76bcef527b0d3cee90a2cd3
Author:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
AuthorDate: Thu Sep 12 18:12:02 2019 -0500
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Oct 30 11:39:09 2019 -0500

    roms/Makefile.edk2: don't pull in submodules when building from tarball
    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.
    Cc: Laszlo Ersek <lersek@xxxxxxxxxx>
    Cc: Bruce Rogers <brogers@xxxxxxxx>
    Cc: qemu-stable@xxxxxxxxxx # v4.1.0
    Reported-by: Bruce Rogers <brogers@xxxxxxxx>
    Reviewed-by: Laszlo Ersek <lersek@xxxxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Tested-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
    Message-Id: <20190912231202.12327-3-mdroth@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    (cherry picked from commit f3e330e3c319160ac04954399b5a10afc965098c)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
 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.
-       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".
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.13



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.