コミット: f3e330e3c319160ac04954399b5a10afc965098c - qemu (git)

コミットメタ情報

• リビジョン: f3e330e3c319160ac04954399b5a10afc965098c (tree)
• 日時: 2019-10-07 21:54:48
• 作者: Michael Roth <mdroth@linu...>
• コミッター: Philippe Mathieu-Daudé

ログメッセージ

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 <[e-mail]>
Cc: Bruce Rogers <[e-mail]>
Cc: [e-mail] # v4.1.0
Reported-by: Bruce Rogers <[e-mail]>
Reviewed-by: Laszlo Ersek <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Tested-by: Philippe Mathieu-Daudé <[e-mail]>
Signed-off-by: Michael Roth <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>

変更サマリ

• modified: roms/Makefile.edk2

差分

--- 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".