aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2019-05-30 21:28:11 +0200
committerPhilippe Mathieu-Daudé <philmd@redhat.com>2019-08-03 09:52:32 +0200
commit177cd674d6203d3c1a98e170ea56c5a904ac4ce8 (patch)
tree08b8cb63209c4d8aa5f0422202b174c32a701b00
parent9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59 (diff)
downloadqemu-177cd674d6203d3c1a98e170ea56c5a904ac4ce8.zip
qemu-177cd674d6203d3c1a98e170ea56c5a904ac4ce8.tar.gz
qemu-177cd674d6203d3c1a98e170ea56c5a904ac4ce8.tar.bz2
Makefile: remove DESTDIR from firmware file content
The resulting firmware files should only contain the runtime path. Fixes commit 26ce90fde5c ("Makefile: install the edk2 firmware images and their descriptors") Signed-off-by: Olaf Hering <olaf@aepfle.de> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Message-Id: <20190530192812.17637-1-olaf@aepfle.de> Fixes: https://bugs.launchpad.net/qemu/+bug/1838703 Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cfab156..85862fb 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"; \