[v1,05/14] docker: disable Xen on CentOS 7

Message ID	20190125140017.6092-6-alex.bennee@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 14:00:08 +0000 Message-Id: <20190125140017.6092-6-alex.bennee@linaro.org> In-Reply-To: <20190125140017.6092-1-alex.bennee@linaro.org> References: <20190125140017.6092-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v1 05/14] docker: disable Xen on CentOS 7 Precedence: list Cc: Fam Zheng <fam@euphon.net>, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	testing/next (binfmt_misc, vm-build and BSD CI) \| expand [v1,00/14] testing/next (binfmt_misc, vm-build and BSD CI) [v1,01/14] .cirrus.yml: basic compile and test for FreeBSD [v1,02/14] travis: stop requesting libffi & gettext from homebrew [v1,03/14] MAINTAINERS: Add an entry for scripts/archive-source.sh [v1,04/14] archive-source.sh: Clone the submodules locally [v1,05/14] docker: disable Xen on CentOS 7 [v1,06/14] tests: make docker.py update use configured binfmt path [v1,07/14] tests: make docker.py check for persistent configs [v1,08/14] tests: docker.py be even smarter with persistent binfmt_misc [v1,09/14] tests: PEP8 cleanup of docker.py, mostly white space [v1,10/14] tests/vm: move images to $HOME/.cache/qemu-vm/images [v1,11/14] tests/vm: call make check directly for netbsd/freebsd/ubuntu.i386 [v1,12/14] tests/vm: add --build-target option [v1,13/14] tests/vm: expose BUILD_TARGET, TARGET_LIST and EXTRA_CONFIGURE_OPTS [v1,14/14] scripts/qemu.py: allow arches use KVM for their 32bit cousins

Message ID

20190125140017.6092-6-alex.bennee@linaro.org

State

New

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Date: Fri, 25 Jan 2019 14:00:08 +0000
Message-Id: <20190125140017.6092-6-alex.bennee@linaro.org>
In-Reply-To: <20190125140017.6092-1-alex.bennee@linaro.org>
References: <20190125140017.6092-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH  v1 05/14] docker: disable Xen on CentOS 7
Precedence: list
Cc: Fam Zheng <fam@euphon.net>, Paolo Bonzini <pbonzini@redhat.com>,
	=?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>,
	=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

testing/next (binfmt_misc, vm-build and BSD CI) | expand

Commit Message

Alex Bennée Jan. 25, 2019, 2 p.m. UTC

From: Paolo Bonzini <pbonzini@redhat.com>


The Xen repository is failing to install, disable it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/docker/dockerfiles/centos7.docker | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

-- 
2.17.1

Comments

Paolo Bonzini Jan. 25, 2019, 2:04 p.m. UTC | #1

On 25/01/19 15:00, Alex Bennée wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>

> 

> The Xen repository is failing to install, disable it.

> 

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


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

>

Alex Bennée Jan. 25, 2019, 3:26 p.m. UTC | #2

Paolo Bonzini <pbonzini@redhat.com> writes:

> On 25/01/19 15:00, Alex Bennée wrote:

>> From: Paolo Bonzini <pbonzini@redhat.com>

>>

>> The Xen repository is failing to install, disable it.

>>

>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

>

> 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

> +


What happens if the upstream project moves to a newer release? Will it
break again?

>  RUN yum -y update

>  ENV PACKAGES \

>      bison \

>

>

> I can include it in my pull request too.


Sure... I mainly pulled it in because it's used by the centos VM. I'm
unlikely to get a PR out today as there are some reviews needed.

>

> 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

>>



--
Alex Bennée

Paolo Bonzini Jan. 25, 2019, 3:27 p.m. UTC | #3

On 25/01/19 16:26, Alex Bennée wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:

> 

>> On 25/01/19 15:00, Alex Bennée wrote:

>>> From: Paolo Bonzini <pbonzini@redhat.com>

>>>

>>> The Xen repository is failing to install, disable it.

>>>

>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

>> 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

>> +

> What happens if the upstream project moves to a newer release? Will it

> break again?

> 


I don't know. We'll see. :)

Paolo

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

[v1,05/14] docker: disable Xen on CentOS 7

Commit Message

Comments

Patch