Re: [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content

[Philippe Mathieu-Daudé]

[Odd, I'm pretty sure I replied to this last week but can't find it, so
again]
Cc'ing Laszlo since he wrote this.

On 5/30/19 9:28 PM, Olaf Hering wrote:
> 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 <address@hidden>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index f0be624f47..61267bf1a4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -844,7 +844,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),' \

I'm fine with this patch.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

Laszlo, did you use the full path for a particular reason?

>                       "$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \
>               $(INSTALL_DATA) "$$tmpf" \
>                       "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \
>