aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-08-05 11:05:36 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-08-05 11:05:36 +0100
commit9bb68d34dda9be60335e73e65c8fb61bca035362 (patch)
tree215477fb17f0ebf3c0d8826450736beb473ff27a
parent02ac2f7f613b47f6a5b397b20ab0e6b2e7fb89fa (diff)
parent177cd674d6203d3c1a98e170ea56c5a904ac4ce8 (diff)
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: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cfab1561b9..85862fb81a 100644
--- a/Makefile
+++ b/Makefile
@@ -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"; \