Re: [Qemu-devel] [PATCH v1 05/14] docker: disable Xen on CentOS 7

[Paolo Bonzini]

On 25/01/19 15:00, Alex Bennée wrote:
> From: Paolo Bonzini <address@hidden>
> 
> The Xen repository is failing to install, disable it.
> 
> Signed-off-by: Paolo Bonzini <address@hidden>
> Signed-off-by: Alex Bennée <address@hidden>

A better version:

--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -1,5 +1,6 @@
 FROM centos:7
-RUN yum install -y epel-release centos-release-xen
+RUN yum install -y epel-release centos-release-xen-48
+
 RUN yum -y update
 ENV PACKAGES \
     bison \


I can include it in my pull request too.

Paolo

> ---
>  tests/docker/dockerfiles/centos7.docker | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/centos7.docker 
> b/tests/docker/dockerfiles/centos7.docker
> index e0f18f5a41..e6fcbf4bcd 100644
> --- a/tests/docker/dockerfiles/centos7.docker
> +++ b/tests/docker/dockerfiles/centos7.docker
> @@ -1,5 +1,5 @@
>  FROM centos:7
> -RUN yum install -y epel-release centos-release-xen
> +RUN yum install -y epel-release
>  RUN yum -y update
>  ENV PACKAGES \
>      bison \
> @@ -8,7 +8,7 @@ ENV PACKAGES \
>      ccache \
>      csnappy-devel \
>      flex \
> -    g++ \
> +    gcc-c++ \
>      gcc \
>      gettext \
>      git \
> @@ -29,7 +29,6 @@ ENV PACKAGES \
>      spice-server-devel \
>      tar \
>      vte-devel \
> -    xen-devel \
>      zlib-devel
>  RUN yum install -y $PACKAGES
>  RUN rpm -q $PACKAGES | sort > /packages.txt
>