* [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content
@ 2019-05-30 19:28 Olaf Hering
2019-06-05 14:07 ` Daniel P. Berrangé
2019-06-05 14:46 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 5+ messages in thread
From: Olaf Hering @ 2019-05-30 19:28 UTC (permalink / raw)
To: qemu-devel
Cc: Olaf Hering, Daniel P. Berrangé, Philippe Mathieu-Daudé,
Gerd Hoffmann, Marc-André Lureau, Alex Bennée
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>
---
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),' \
"$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \
$(INSTALL_DATA) "$$tmpf" \
"$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content
2019-05-30 19:28 [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content Olaf Hering
@ 2019-06-05 14:07 ` Daniel P. Berrangé
2019-06-05 14:46 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 5+ messages in thread
From: Daniel P. Berrangé @ 2019-06-05 14:07 UTC (permalink / raw)
To: Olaf Hering
Cc: Alex Bennée, Marc-André Lureau,
Philippe Mathieu-Daudé, qemu-devel, Gerd Hoffmann
On Thu, May 30, 2019 at 09:28:11PM +0200, 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 <olaf@aepfle.de>
> ---
> 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),' \
> "$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \
> $(INSTALL_DATA) "$$tmpf" \
> "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content
2019-05-30 19:28 [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content Olaf Hering
2019-06-05 14:07 ` Daniel P. Berrangé
@ 2019-06-05 14:46 ` Philippe Mathieu-Daudé
2019-06-05 16:31 ` Laszlo Ersek
1 sibling, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-06-05 14:46 UTC (permalink / raw)
To: Olaf Hering, qemu-devel, Laszlo Ersek
Cc: Daniel P. Berrangé, Alex Bennée, Gerd Hoffmann,
Marc-André Lureau
[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 <olaf@aepfle.de>
> ---
> 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é <philmd@redhat.com>
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"; \
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content
2019-06-05 14:46 ` Philippe Mathieu-Daudé
@ 2019-06-05 16:31 ` Laszlo Ersek
2019-06-05 16:45 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Laszlo Ersek @ 2019-06-05 16:31 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Olaf Hering, qemu-devel
Cc: Daniel P. Berrangé, Alex Bennée, Gerd Hoffmann,
Marc-André Lureau
On 06/05/19 16:46, Philippe Mathieu-Daudé wrote:
> [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 <olaf@aepfle.de>
>> ---
>> 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é <philmd@redhat.com>
>
> Laszlo, did you use the full path for a particular reason?
Yes. The reason was that I had no idea what DESTDIR stood for. After
grepping the QEMU source tree for DESTDIR, I *still* have no idea what
it stands for.
DESTDIR seems to be an installation prefix that is not controlled through
./configre --prefix=...
Based on memories from other projects -- with better documentation --
though, DESTDIR looks like an install-time-only pre-prefix. In that
sense, the patch looks correct (and the vague expression "runtime path"
in the commit message starts to make some sense). Presumably DESTDIR is
used in package build scripts... Yup, the RHEL spec files use it too,
for "make install".
So, the patch is correct IMO:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Too bad QEMU is chronically under-documented (and the commit message on
the patch doesn't help much in that regard).
Thanks
Laszlo
>> "$(SRC_PATH)/pc-bios/descriptors/$$x" > "$$tmpf"; \
>> $(INSTALL_DATA) "$$tmpf" \
>> "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \
>>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content
2019-06-05 16:31 ` Laszlo Ersek
@ 2019-06-05 16:45 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-06-05 16:45 UTC (permalink / raw)
To: Laszlo Ersek, Olaf Hering, qemu-devel
Cc: Daniel P. Berrangé, Alex Bennée, Gerd Hoffmann,
Marc-André Lureau
On 6/5/19 6:31 PM, Laszlo Ersek wrote:
> On 06/05/19 16:46, Philippe Mathieu-Daudé wrote:
>> [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 <olaf@aepfle.de>
>>> ---
>>> 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é <philmd@redhat.com>
>>
>> Laszlo, did you use the full path for a particular reason?
>
> Yes. The reason was that I had no idea what DESTDIR stood for. After
> grepping the QEMU source tree for DESTDIR, I *still* have no idea what
> it stands for.
>
> DESTDIR seems to be an installation prefix that is not controlled through
>
> ./configre --prefix=...
>
> Based on memories from other projects -- with better documentation --
> though, DESTDIR looks like an install-time-only pre-prefix. In that
> sense, the patch looks correct (and the vague expression "runtime path"
> in the commit message starts to make some sense). Presumably DESTDIR is
> used in package build scripts... Yup, the RHEL spec files use it too,
> for "make install".
>
> So, the patch is correct IMO:
>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
> Too bad QEMU is chronically under-documented (and the commit message on
> the patch doesn't help much in that regard).
At least the git history is public :)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-06-05 16:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-30 19:28 [Qemu-devel] [PATCH v1] Makefile: remove DESTDIR from firmware file content Olaf Hering
2019-06-05 14:07 ` Daniel P. Berrangé
2019-06-05 14:46 ` Philippe Mathieu-Daudé
2019-06-05 16:31 ` Laszlo Ersek
2019-06-05 16:45 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).