tests/docker: Fixes for 5.0
v2 cover tests/docker: Fixes for 5.0
Easy fixes for our Docker images.
Since v1:
- Reword gcrypt patch description (requested by Aleksandar)
Philippe Mathieu-Daudé (4):
tests/docker: Keep package list sorted
tests/docker: Install gcrypt devel package in Debian image tests/docker: Use Python3 PyYAML in the Fedora image tests/docker: Add libepoxy and libudev packages to the Fedora image
tests/docker/dockerfiles/centos7.docker | 6 ++++-- tests/docker/dockerfiles/debian-amd64.docker | 1 + tests/docker/dockerfiles/fedora.docker | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-)
Signature · 1 line
2.21.1
PATCH v2 2/4 tests/docker: Install gcrypt devel package in Debian image
In commit 6f8bbb374be we enabled building with the gcrypt library on the the Debian 'x86 host', which was based on Debian Stretch. Later in commit 698a71edbed we upgraded the Debian base image to Buster.
Apparently Debian Stretch was listing gcrypt as a QEMU dependency, but this is not the case anymore in Buster, so we need to install it manually (it it not listed by 'apt-get -s build-dep qemu' in the common debian10.docker anymore). This fixes:
$ ../configure $QEMU_CONFIGURE_OPTS
ERROR: User requested feature gcrypt
configure was not able to find it.
Install gcrypt devel >= 1.5.0
---
v2: Reword description, do not use 'Fixes:' tag (Aleksandar)
--- tests/docker/dockerfiles/debian-amd64.docker | 1 + 1 file changed, 1 insertion(+)
tests/docker/dockerfiles/debian-amd64.docker +1 -0
@@ -16,6 +16,7 @@ RUN apt update && \ apt install -y --no-install-recommends \ libbz2-dev \ liblzo2-dev \ + libgcrypt20-dev \ librdmacm-dev \ libsasl2-dev \ libsnappy-dev \
Signature · 1 line
2.21.1
PATCH v2 1/4 tests/docker: Keep package list sorted
In reply to Philippe Mathieu-DaudéKeep package list sorted, this eases rebase/cherry-pick.
--- tests/docker/dockerfiles/centos7.docker | 6 ++++-- tests/docker/dockerfiles/fedora.docker | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
tests/docker/dockerfiles/centos7.docker +4 -2
@@ -2,6 +2,8 @@ FROM centos:7 RUN yum install -y epel-release centos-release-xen-48 RUN yum -y update + +# Please keep this list sorted alphabetically ENV PACKAGES \ bison \ bzip2 \
@@ -19,6 +21,7 @@ ENV PACKAGES \ libepoxy-devel \ libfdt-devel \ librdmacm-devel \ + libzstd-devel \ lzo-devel \ make \ mesa-libEGL-devel \
@@ -33,7 +36,6 @@ ENV PACKAGES \ tar \ vte-devel \ xen-devel \ - zlib-devel \ - libzstd-devel + zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt
tests/docker/dockerfiles/fedora.docker +4 -2
@@ -1,4 +1,6 @@ FROM fedora:30 + +# Please keep this list sorted alphabetically ENV PACKAGES \ bc \ bison \
@@ -38,6 +40,7 @@ ENV PACKAGES \ libubsan \ libusbx-devel \ libxml2-devel \ + libzstd-devel \ llvm \ lzo-devel \ make \
@@ -92,8 +95,7 @@ ENV PACKAGES \ vte291-devel \ which \ xen-devel \ - zlib-devel \ - libzstd-devel + zlib-devel ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES
Signature · 1 line
2.21.1
PATCH v2 3/4 tests/docker: Use Python3 PyYAML in the Fedora image
In reply to Philippe Mathieu-DaudéThe Python2 PyYAML is now pointless, switch to the Python3 version.
--- tests/docker/dockerfiles/fedora.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/dockerfiles/fedora.docker +1 -1
@@ -79,8 +79,8 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ + python3-PyYAML \ python3-sphinx \ - PyYAML \ rdma-core-devel \ SDL2-devel \ snappy-devel \
Signature · 1 line
2.21.1
PATCH v2 4/4 tests/docker: Add libepoxy and libudev packages to the Fedora image
In reply to Philippe Mathieu-DaudéInstall optional dependencies of QEMU to get better coverage.
--- tests/docker/dockerfiles/fedora.docker | 2 ++ 1 file changed, 2 insertions(+)
tests/docker/dockerfiles/fedora.docker +2 -0
@@ -29,6 +29,7 @@ ENV PACKAGES \ libblockdev-mpath-devel \ libcap-ng-devel \ libcurl-devel \ + libepoxy-devel \ libfdt-devel \ libiscsi-devel \ libjpeg-devel \
@@ -38,6 +39,7 @@ ENV PACKAGES \ libseccomp-devel \ libssh-devel \ libubsan \ + libudev-devel \ libusbx-devel \ libxml2-devel \ libzstd-devel \
Signature · 1 line
2.21.1
Quoted 1 line · Philippe Mathieu-Daudé
Easy fixes for our Docker images.
Queued to testing/next, thanks.
Quoted 14 lines
Since v1:
- Reword gcrypt patch description (requested by Aleksandar)Philippe Mathieu-Daudé (4):
tests/docker: Keep package list sorted
tests/docker: Install gcrypt devel package in Debian image tests/docker: Use Python3 PyYAML in the Fedora image tests/docker: Add libepoxy and libudev packages to the Fedora imagetests/docker/dockerfiles/centos7.docker | 6 ++++-- tests/docker/dockerfiles/debian-amd64.docker | 1 + tests/docker/dockerfiles/fedora.docker | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-)
Signature · 1 line
Alex Bennée
Quoted 6 lines · Alex Bennée
Quoted 1 line · Philippe Mathieu-Daudé
Easy fixes for our Docker images.
Queued to testing/next, thanks.
Thanks, but I think Aleksandar wanted to review patch 2/4 "tests/docker: Install gcrypt devel package in Debian image" and now I notice I forgot to Cc him, oops...
Quoted 17 lines
Quoted 15 lines
Since v1:
- Reword gcrypt patch description (requested by Aleksandar)Philippe Mathieu-Daudé (4):
tests/docker: Keep package list sorted
tests/docker: Install gcrypt devel package in Debian image tests/docker: Use Python3 PyYAML in the Fedora image tests/docker: Add libepoxy and libudev packages to the Fedora imagetests/docker/dockerfiles/centos7.docker | 6 ++++-- tests/docker/dockerfiles/debian-amd64.docker | 1 + tests/docker/dockerfiles/fedora.docker | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-)
Re: [PATCH-for-5.0 v2 2/4] tests/docker: Install gcrypt devel package in Debian image
In reply to Philippe Mathieu-DaudéQuoted 4 lines · Philippe Mathieu-Daudé
In commit
6f8bbb374bewe enabled building with the gcrypt library on the the Debian 'x86 host', which was based on Debian Stretch. Later in commit698a71edbedwe upgraded the Debian base image to Buster.
Aleksandar, is this updated description OK with you?
Quoted 32 lines
Apparently Debian Stretch was listing gcrypt as a QEMU dependency, but this is not the case anymore in Buster, so we need to install it manually (it it not listed by 'apt-get -s build-dep qemu' in the common debian10.docker anymore). This fixes:
$ ../configure $QEMU_CONFIGURE_OPTSERROR: User requested feature gcrypt
configure was not able to find it.
Install gcrypt devel >= 1.5.0Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: Reword description, do not use 'Fixes:' tag (Aleksandar)--- tests/docker/dockerfiles/debian-amd64.docker | 1 + 1 file changed, 1 insertion(+)tests/docker/dockerfiles/debian-amd64.docker +1
-0@@ -16,6 +16,7 @@ RUN apt update && \ apt install -y --no-install-recommends \ libbz2-dev \ liblzo2-dev \ + libgcrypt20-dev \ librdmacm-dev \ libsasl2-dev \ libsnappy-dev \