Commit 9bb68d34 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/edk2-next-20190803' into staging 



A harmless build-sys patch that fixes a regression affecting Linux
distributions packaging QEMU.

# gpg: Signature made Sat 03 Aug 2019 09:24:15 BST
# gpg:                using RSA key E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/edk2-next-20190803:
  Makefile: remove DESTDIR from firmware file content

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 02ac2f7f 177cd674

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ ifneq ($(DESCS),) 
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/firmware"

	set -e; tmpf=$$(mktemp); trap 'rm -f -- "$$tmpf"' EXIT; \

	for x in $(DESCS); do \

		sed -e 's,@DATADIR@,$(DESTDIR)$(qemu_datadir),' \

		sed -e 's,@DATADIR@,$(qemu_datadir),' \

			"$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \

		$(INSTALL_DATA) "$$tmpf" \

			"$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \