[Qemu-devel] [PULL 0/1] EDK2 firmware patches

[Qemu-devel] [PULL 0/1] EDK2 firmware patches

[Philippe Mathieu-Daudé]

The following changes since commit 9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59:

  Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request' into staging (2019-08-02 13:06:03 +0100)

are available in the Git repository at:

  https://gitlab.com/philmd/qemu.git tags/edk2-next-20190803

for you to fetch changes up to 177cd674d6203d3c1a98e170ea56c5a904ac4ce8:

  Makefile: remove DESTDIR from firmware file content (2019-08-03 09:52:32 +0200)

----------------------------------------------------------------
A harmless build-sys patch that fixes a regression affecting Linux
distributions packaging QEMU.

----------------------------------------------------------------

Olaf Hering (1):
  Makefile: remove DESTDIR from firmware file content

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.1

[Qemu-devel] [PULL 1/1] Makefile: remove DESTDIR from firmware file content

[Philippe Mathieu-Daudé]

From: Olaf Hering <olaf@aepfle.de>

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"; \
-- 
2.20.1

Re: [Qemu-devel] [PULL 0/1] EDK2 firmware patches

[Peter Maydell]

On Sat, 3 Aug 2019 at 09:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> The following changes since commit 9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59:
>
>   Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request' into staging (2019-08-02 13:06:03 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/philmd/qemu.git tags/edk2-next-20190803
>
> for you to fetch changes up to 177cd674d6203d3c1a98e170ea56c5a904ac4ce8:
>
>   Makefile: remove DESTDIR from firmware file content (2019-08-03 09:52:32 +0200)
>
> ----------------------------------------------------------------
> A harmless build-sys patch that fixes a regression affecting Linux
> distributions packaging QEMU.
>
> ----------------------------------------------------------------
>
> Olaf Hering (1):
>   Makefile: remove DESTDIR from firmware file content

Is this pullreq intended for 4.1 ?

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] EDK2 firmware patches

[Michal Prívozník]

On 8/3/19 12:22 PM, Peter Maydell wrote:
> On Sat, 3 Aug 2019 at 09:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>
>> The following changes since commit 9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59:
>>
>>   Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request' into staging (2019-08-02 13:06:03 +0100)
>>
>> are available in the Git repository at:
>>
>>   https://gitlab.com/philmd/qemu.git tags/edk2-next-20190803
>>
>> for you to fetch changes up to 177cd674d6203d3c1a98e170ea56c5a904ac4ce8:
>>
>>   Makefile: remove DESTDIR from firmware file content (2019-08-03 09:52:32 +0200)
>>
>> ----------------------------------------------------------------
>> A harmless build-sys patch that fixes a regression affecting Linux
>> distributions packaging QEMU.
>>
>> ----------------------------------------------------------------
>>
>> Olaf Hering (1):
>>   Makefile: remove DESTDIR from firmware file content
> 
> Is this pullreq intended for 4.1 ?

Please do pull it into 4.1 as the commit it fixes is aiming at 4.1 (just
like the whole feature). If not included then distros will need to
backport it anyway. Just my $0.02. Let's wait for Philippe's confirmation.

Michal

Re: [Qemu-devel] [PULL 0/1] EDK2 firmware patches

[Philippe Mathieu-Daudé]

Hi Peter,

On 8/5/19 3:13 PM, Michal Prívozník wrote:
> On 8/3/19 12:22 PM, Peter Maydell wrote:
>> On Sat, 3 Aug 2019 at 09:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>>
>>> The following changes since commit 9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59:
>>>
>>>   Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request' into staging (2019-08-02 13:06:03 +0100)
>>>
>>> are available in the Git repository at:
>>>
>>>   https://gitlab.com/philmd/qemu.git tags/edk2-next-20190803
>>>
>>> for you to fetch changes up to 177cd674d6203d3c1a98e170ea56c5a904ac4ce8:
>>>
>>>   Makefile: remove DESTDIR from firmware file content (2019-08-03 09:52:32 +0200)
>>>
>>> ----------------------------------------------------------------
>>> A harmless build-sys patch that fixes a regression affecting Linux
>>> distributions packaging QEMU.
>>>
>>> ----------------------------------------------------------------
>>>
>>> Olaf Hering (1):
>>>   Makefile: remove DESTDIR from firmware file content
>>
>> Is this pullreq intended for 4.1 ?

Sorry, I was not sure how to comment on the pullreq cover (everything
between the '---' lines get include in the merge commit description).

This fix a regression introduced during the current development cycle.
Already 3 different distributions hit this issue and complained (Suse,
ArchLinux and Fedora).
This is not a critical/security issue and distributions can easily
backport this patch, but since there is a RC4 planned, it would be nice
regarding distributors to fix this if possible.

> Please do pull it into 4.1 as the commit it fixes is aiming at 4.1 (just
> like the whole feature). If not included then distros will need to
> backport it anyway. Just my $0.02. Let's wait for Philippe's confirmation.
Exactly.

Thanks,

Phil.

Re: [Qemu-devel] [PULL 0/1] EDK2 firmware patches

[Peter Maydell]

On Mon, 5 Aug 2019 at 15:11, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Hi Peter,
>
> On 8/5/19 3:13 PM, Michal Prívozník wrote:
> > On 8/3/19 12:22 PM, Peter Maydell wrote:
> >> On Sat, 3 Aug 2019 at 09:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> >>>
> >>> The following changes since commit 9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59:
> >>>
> >>>   Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request' into staging (2019-08-02 13:06:03 +0100)
> >>>
> >>> are available in the Git repository at:
> >>>
> >>>   https://gitlab.com/philmd/qemu.git tags/edk2-next-20190803
> >>>
> >>> for you to fetch changes up to 177cd674d6203d3c1a98e170ea56c5a904ac4ce8:
> >>>
> >>>   Makefile: remove DESTDIR from firmware file content (2019-08-03 09:52:32 +0200)
> >>>
> >>> ----------------------------------------------------------------
> >>> A harmless build-sys patch that fixes a regression affecting Linux
> >>> distributions packaging QEMU.
> >>>
> >>> ----------------------------------------------------------------
> >>>
> >>> Olaf Hering (1):
> >>>   Makefile: remove DESTDIR from firmware file content
> >>
> >> Is this pullreq intended for 4.1 ?
>
> Sorry, I was not sure how to comment on the pullreq cover (everything
> between the '---' lines get include in the merge commit description).

Depends on your workflow. For me my pull-request-creation
script creates a bunch of files which will be the emails
to be sent out, and I can manually edit the 'cover letter'
email before sending everything.

> This fix a regression introduced during the current development cycle.
> Already 3 different distributions hit this issue and complained (Suse,
> ArchLinux and Fedora).
> This is not a critical/security issue and distributions can easily
> backport this patch, but since there is a RC4 planned, it would be nice
> regarding distributors to fix this if possible.

OK, sounds good -- I just wanted to check. I've pushed the
pullreq to master.

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] EDK2 firmware patches

[Philippe Mathieu-Daudé]

On 8/5/19 4:14 PM, Peter Maydell wrote:
> On Mon, 5 Aug 2019 at 15:11, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>
>> Hi Peter,
>>
>> On 8/5/19 3:13 PM, Michal Prívozník wrote:
>>> On 8/3/19 12:22 PM, Peter Maydell wrote:
>>>> On Sat, 3 Aug 2019 at 09:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>>>>
>>>>> The following changes since commit 9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59:
>>>>>
>>>>>   Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request' into staging (2019-08-02 13:06:03 +0100)
>>>>>
>>>>> are available in the Git repository at:
>>>>>
>>>>>   https://gitlab.com/philmd/qemu.git tags/edk2-next-20190803
>>>>>
>>>>> for you to fetch changes up to 177cd674d6203d3c1a98e170ea56c5a904ac4ce8:
>>>>>
>>>>>   Makefile: remove DESTDIR from firmware file content (2019-08-03 09:52:32 +0200)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> A harmless build-sys patch that fixes a regression affecting Linux
>>>>> distributions packaging QEMU.
>>>>>
>>>>> ----------------------------------------------------------------
>>>>>
>>>>> Olaf Hering (1):
>>>>>   Makefile: remove DESTDIR from firmware file content
>>>>
>>>> Is this pullreq intended for 4.1 ?
>>
>> Sorry, I was not sure how to comment on the pullreq cover (everything
>> between the '---' lines get include in the merge commit description).
> 
> Depends on your workflow. For me my pull-request-creation
> script creates a bunch of files which will be the emails
> to be sent out, and I can manually edit the 'cover letter'
> email before sending everything.

OK (I don't want to give you extra manual work).

>> This fix a regression introduced during the current development cycle.
>> Already 3 different distributions hit this issue and complained (Suse,
>> ArchLinux and Fedora).
>> This is not a critical/security issue and distributions can easily
>> backport this patch, but since there is a RC4 planned, it would be nice
>> regarding distributors to fix this if possible.
> 
> OK, sounds good -- I just wanted to check. I've pushed the
> pullreq to master.

Thank you!

Re: [Qemu-devel] [PULL 0/1] EDK2 firmware patches

[Laszlo Ersek]

On 08/05/19 16:29, Philippe Mathieu-Daudé wrote:
> On 8/5/19 4:14 PM, Peter Maydell wrote:
>> On Mon, 5 Aug 2019 at 15:11, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>>
>>> Hi Peter,
>>>
>>> On 8/5/19 3:13 PM, Michal Prívozník wrote:
>>>> On 8/3/19 12:22 PM, Peter Maydell wrote:
>>>>> On Sat, 3 Aug 2019 at 09:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>>>>>
>>>>>> The following changes since commit 9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59:
>>>>>>
>>>>>>   Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request' into staging (2019-08-02 13:06:03 +0100)
>>>>>>
>>>>>> are available in the Git repository at:
>>>>>>
>>>>>>   https://gitlab.com/philmd/qemu.git tags/edk2-next-20190803
>>>>>>
>>>>>> for you to fetch changes up to 177cd674d6203d3c1a98e170ea56c5a904ac4ce8:
>>>>>>
>>>>>>   Makefile: remove DESTDIR from firmware file content (2019-08-03 09:52:32 +0200)
>>>>>>
>>>>>> ----------------------------------------------------------------
>>>>>> A harmless build-sys patch that fixes a regression affecting Linux
>>>>>> distributions packaging QEMU.
>>>>>>
>>>>>> ----------------------------------------------------------------
>>>>>>
>>>>>> Olaf Hering (1):
>>>>>>   Makefile: remove DESTDIR from firmware file content
>>>>>
>>>>> Is this pullreq intended for 4.1 ?
>>>
>>> Sorry, I was not sure how to comment on the pullreq cover (everything
>>> between the '---' lines get include in the merge commit description).
>>
>> Depends on your workflow. For me my pull-request-creation
>> script creates a bunch of files which will be the emails
>> to be sent out, and I can manually edit the 'cover letter'
>> email before sending everything.
> 
> OK (I don't want to give you extra manual work).
> 
>>> This fix a regression introduced during the current development cycle.
>>> Already 3 different distributions hit this issue and complained (Suse,
>>> ArchLinux and Fedora).
>>> This is not a critical/security issue and distributions can easily
>>> backport this patch, but since there is a RC4 planned, it would be nice
>>> regarding distributors to fix this if possible.
>>
>> OK, sounds good -- I just wanted to check. I've pushed the
>> pullreq to master.
> 
> Thank you!
> 

Thank you all, I've updated <https://bugs.launchpad.net/qemu/+bug/1838703>.

Laszlo