1e4b6553e3
This patch backports bugfix patch series from qemu upstream v4.1.1 Signed-off-by: Ying Fang <fangying1@huawei.com>
55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
From fc5afb1a9230fe21d76bcef527b0d3cee90a2cd3 Mon Sep 17 00:00:00 2001
|
|
From: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
Date: Thu, 12 Sep 2019 18:12:02 -0500
|
|
Subject: [PATCH] roms/Makefile.edk2: don't pull in submodules when building
|
|
from tarball
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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@redhat.com>
|
|
Cc: Bruce Rogers <brogers@suse.com>
|
|
Cc: qemu-stable@nongnu.org # v4.1.0
|
|
Reported-by: Bruce Rogers <brogers@suse.com>
|
|
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
Message-Id: <20190912231202.12327-3-mdroth@linux.vnet.ibm.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
(cherry picked from commit f3e330e3c319160ac04954399b5a10afc965098c)
|
|
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".
|
|
--
|
|
2.23.0
|