Makefile: remove DESTDIR from firmware file content
authorOlaf Hering <olaf@aepfle.de>
Thu, 30 May 2019 19:28:11 +0000 (21:28 +0200)
committerPhilippe Mathieu-Daudé <philmd@redhat.com>
Sat, 3 Aug 2019 07:52:32 +0000 (09:52 +0200)
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>
Makefile

index cfab1561b9cf76c087718dd4eb3ac786393b9b59..85862fb81a1d276c41133a31b2d9fa0b745765cf 100644 (file)
--- 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"; \