For some reason diffutils is not included in the Fedora containers anymore,
causing the build to fail.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/docker/dockerfiles/fedora.docker | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 71e4b56977..ec783418c8 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -11,6 +11,7 @@ ENV PACKAGES \
     cyrus-sasl-devel \
     dbus-daemon \
     device-mapper-multipath-devel \
+    diffutils \
     findutils \
     gcc \
     gcc-c++ \
-- 
2.26.2

On 10/3/20 10:50 AM, Paolo Bonzini wrote:
> For some reason diffutils is not included in the Fedora containers anymore,
> causing the build to fail.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora.docker | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index 71e4b56977..ec783418c8 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -11,6 +11,7 @@ ENV PACKAGES \
>      cyrus-sasl-devel \
>      dbus-daemon \
>      device-mapper-multipath-devel \
> +    diffutils \
>      findutils \
>      gcc \
>      gcc-c++ \
> 

What about tests/docker/dockerfiles/fedora-cris-cross.docker
and tests/docker/dockerfiles/fedora-i386-cross.docker?

On 03/10/20 20:00, Philippe Mathieu-Daudé wrote:
>>
>> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
>> index 71e4b56977..ec783418c8 100644
>> --- a/tests/docker/dockerfiles/fedora.docker
>> +++ b/tests/docker/dockerfiles/fedora.docker
>> @@ -11,6 +11,7 @@ ENV PACKAGES \
>>      cyrus-sasl-devel \
>>      dbus-daemon \
>>      device-mapper-multipath-devel \
>> +    diffutils \
>>      findutils \
>>      gcc \
>>      gcc-c++ \
>>
> What about tests/docker/dockerfiles/fedora-cris-cross.docker
> and tests/docker/dockerfiles/fedora-i386-cross.docker?
> 

They're only used for gcc, not to build QEMU.

Paolo

On 10/4/20 8:34 AM, Paolo Bonzini wrote:
> On 03/10/20 20:00, Philippe Mathieu-Daudé wrote:
>>>
>>> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
>>> index 71e4b56977..ec783418c8 100644
>>> --- a/tests/docker/dockerfiles/fedora.docker
>>> +++ b/tests/docker/dockerfiles/fedora.docker
>>> @@ -11,6 +11,7 @@ ENV PACKAGES \
>>>      cyrus-sasl-devel \
>>>      dbus-daemon \
>>>      device-mapper-multipath-devel \
>>> +    diffutils \
>>>      findutils \
>>>      gcc \
>>>      gcc-c++ \
>>>
>> What about tests/docker/dockerfiles/fedora-cris-cross.docker
>> and tests/docker/dockerfiles/fedora-i386-cross.docker?
>>
> 
> They're only used for gcc, not to build QEMU.

Ah OK.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> 
> Paolo
> 
> 

On Sat, Oct 3, 2020 at 4:51 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> For some reason diffutils is not included in the Fedora containers anymore,
> causing the build to fail.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  tests/docker/dockerfiles/fedora.docker | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index 71e4b56977..ec783418c8 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -11,6 +11,7 @@ ENV PACKAGES \
>      cyrus-sasl-devel \
>      dbus-daemon \
>      device-mapper-multipath-devel \
> +    diffutils \
>      findutils \
>      gcc \
>      gcc-c++ \
> --
> 2.26.2
>
>

Reviewed-by: Neal Gompa <ngompa13@gmail.com>


-- 
真実はいつも一つ！/ Always, there's only one truth!