File qemu.ec87b5daca761039bbcf781eedbe4987f790836f.p... of Package qemu

Overview Repositories Revisions Requests Users Attributes Meta

File qemu.ec87b5daca761039bbcf781eedbe4987f790836f.patch of Package qemu (Revision 88d0d4416cf18ddaf1b8bebc41a02742)

Currently displaying revision 88d0d4416cf18ddaf1b8bebc41a02742 , Show latest

From: Olaf Hering <olaf@aepfle.de>
Date: Tue, 20 Oct 2020 15:02:15 +0200
Subject: ec87b5daca761039bbcf781eedbe4987f790836f

Revert "roms/efirom, tests/uefi-test-tools: update edk2's own submodules first"

This reverts commit ec87b5daca761039bbcf781eedbe4987f790836f.
---
 roms/Makefile                  | 2 --
 tests/uefi-test-tools/Makefile | 1 -
 2 files changed, 3 deletions(-)

--- a/roms/Makefile
+++ b/roms/Makefile
@@ -134,26 +134,24 @@ build-efi-roms: build-pxe-roms
 # Build scripts can pass compiler/linker flags to the EDK2
 # build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and
 # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
 #
 # Example:
 #
 #  make -C roms \
 #    EDK2_BASETOOLS_OPTFLAGS='...' \
 #    EDK2_BASETOOLS_LDFLAGS='...' \
 #    efirom
 #
 edk2-basetools:
-	cd edk2/BaseTools && git submodule update --init --force \
-		Source/C/BrotliCompress/brotli
 	$(MAKE) -C edk2/BaseTools \
 		PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \
 		EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
 		EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'
 
 slof:
 	$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
 	cp SLOF/boot_rom.bin ../pc-bios/slof.bin
 
 u-boot.e500:
 	$(MAKE) -C u-boot O=build-e500 qemu-ppce500_config
 	$(MAKE) -C u-boot CROSS_COMPILE=$(powerpc_cross_prefix) \
--- a/tests/uefi-test-tools/Makefile
+++ b/tests/uefi-test-tools/Makefile
@@ -90,21 +90,20 @@ Build/%.fat: Build/%.efi
 # Although the outer "make" process advertizes its job server to all child
 # processes via MAKEFLAGS in the environment, the outer "make" closes the job
 # server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
 # unless the recipe is recognized as a recursive "make" recipe. Recipes that
 # call $(MAKE) are classified automatically as recursive; for "build.sh" below,
 # we must mark the recipe manually as recursive, by using the "+" indicator.
 # This way, when the inner "make" starts a parallel build of the target edk2
 # module, it can communicate with the outer "make"'s job server.
 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)' \
 		EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'
 
 clean:
 	rm -rf Build Conf log
 	$(MAKE) -C $(edk2_dir)/BaseTools clean

Places

File qemu.ec87b5daca761039bbcf781eedbe4987f790836f.patch of Package qemu (Revision 88d0d4416cf18ddaf1b8bebc41a02742)

Places