aboutsummaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2018-05-04 15:34:46 +0100
committerDaniel P. Berrangé <berrange@redhat.com>2018-06-29 12:22:28 +0100
commite7b3af81597db1a6b55f2c15d030d703c6b2c6ac (patch)
tree0a60dec924a1f4398b2a98df68cbc4a003c398d8 /tests/docker
parentc5f1d0c493f29f0137fbd79a2c6653f8546f2044 (diff)
downloadqemu-e7b3af81597db1a6b55f2c15d030d703c6b2c6ac.zip
qemu-e7b3af81597db1a6b55f2c15d030d703c6b2c6ac.tar.gz
qemu-e7b3af81597db1a6b55f2c15d030d703c6b2c6ac.tar.bz2
glib: bump min required glib library version to 2.40
Per supported platforms doc[1], the various min glib on relevant distros is: RHEL-7: 2.50.3 Debian (Stretch): 2.50.3 Debian (Jessie): 2.42.1 OpenBSD (Ports): 2.54.3 FreeBSD (Ports): 2.50.3 OpenSUSE Leap 15: 2.54.3 SLE12-SP2: 2.48.2 Ubuntu (Xenial): 2.48.0 macOS (Homebrew): 2.56.0 This suggests that a minimum glib of 2.42 is a reasonable target. The GLibC compile farm, however, uses Ubuntu 14.04 (Trusty) which only has glib 2.40.0, and this is needed for testing during merge. Thus an exception is made to the documented platform support policy to allow for all three current LTS releases to be supported. Docker jobs that not longer satisfy this new min version are removed. [1] https://qemu.weilnetz.de/doc/qemu-doc.html#Supported-build-platforms Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'tests/docker')
-rw-r--r--tests/docker/dockerfiles/centos6.docker30
-rw-r--r--tests/docker/dockerfiles/min-glib.docker8
2 files changed, 0 insertions, 38 deletions
diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
deleted file mode 100644
index ad24319..0000000
--- a/tests/docker/dockerfiles/centos6.docker
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM centos:6
-RUN yum install -y epel-release centos-release-xen
-ENV PACKAGES \
- bison \
- bzip2-devel \
- ccache \
- csnappy-devel \
- flex \
- g++ \
- gcc \
- gettext \
- git \
- glib2-devel \
- libepoxy-devel \
- libfdt-devel \
- librdmacm-devel \
- lzo-devel \
- make \
- mesa-libEGL-devel \
- mesa-libgbm-devel \
- pixman-devel \
- SDL-devel \
- spice-glib-devel \
- spice-server-devel \
- tar \
- vte-devel \
- xen-devel \
- zlib-devel
-RUN yum install -y $PACKAGES
-RUN rpm -q $PACKAGES | sort > /packages.txt
diff --git a/tests/docker/dockerfiles/min-glib.docker b/tests/docker/dockerfiles/min-glib.docker
deleted file mode 100644
index f2eed97..0000000
--- a/tests/docker/dockerfiles/min-glib.docker
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM centos:6
-RUN yum install -y \
- tar gettext git make gcc g++ \
- zlib-devel SDL-devel pixman-devel \
- epel-release
-RUN yum install -y libfdt-devel ccache
-RUN yum downgrade -y http://vault.centos.org/6.0/os/x86_64/Packages/glib2-2.22.5-5.el6.x86_64.rpm
-RUN yum install -y http://vault.centos.org/6.0/os/x86_64/Packages/glib2-devel-2.22.5-5.el6.x86_64.rpm