diff mbox series

[v1,17/39] tests/docker: fix mistakes in ubuntu package lists

Message ID 20210706145817.24109-18-alex.bennee@linaro.org
State New
Headers show
Series final pre-PR for 6.1 (testing and plugins) | expand

Commit Message

Alex Bennée July 6, 2021, 2:57 p.m. UTC 
From: Daniel P. Berrangé <berrange@redhat.com>

librados-dev is not required by QEMU directly, only librbd-dev.

glusterfs-common is not directly needed by QEMU.

QEMU uses ncursesw only on non-Windows hosts.

The clang package is clang 10.

flex and bison are not required by QEMU.

Standardize on nmap ncat implementation to match Fedora/CentOS.

Remove vim since it is not a build pre-requisite and no other containers
include it.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210623142245.307776-10-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/dockerfiles/ubuntu1804.docker |  3 ---
 tests/docker/dockerfiles/ubuntu2004.docker | 10 ++--------
 2 files changed, 2 insertions(+), 11 deletions(-)

Comments

Philippe Mathieu-Daudé July 7, 2021, 2:41 p.m. UTC | #1 
On 7/6/21 4:57 PM, Alex Bennée wrote:
> From: Daniel P. Berrangé <berrange@redhat.com>
> 
> librados-dev is not required by QEMU directly, only librbd-dev.
> 
> glusterfs-common is not directly needed by QEMU.
> 
> QEMU uses ncursesw only on non-Windows hosts.
> 
> The clang package is clang 10.
> 
> flex and bison are not required by QEMU.

Doh, it was practical to cross-build Linux kernel images
while testing:

$ make O=/tmp/build ARCH=mips CROSS_PREFIX=mipsel-linux-gnu- jazz_defconfig
make[1]: Entering directory '/tmp/build'
  GEN     Makefile
  LEX     scripts/kconfig/lexer.lex.c
/bin/sh: 1: flex: not found
make[2]: *** [scripts/Makefile.host:9: scripts/kconfig/lexer.lex.c]
Error 127

But I agree it is not required by QEMU itself.

Should we have a different set of images, one to build QEMU, and
various for building images used to test the built QEMU?

Anyway it will come back soon:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg817164.html

> Standardize on nmap ncat implementation to match Fedora/CentOS.
> 
> Remove vim since it is not a build pre-requisite and no other containers
> include it.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20210623142245.307776-10-berrange@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  tests/docker/dockerfiles/ubuntu1804.docker |  3 ---
>  tests/docker/dockerfiles/ubuntu2004.docker | 10 ++--------
>  2 files changed, 2 insertions(+), 11 deletions(-)
Daniel P. Berrangé July 7, 2021, 2:49 p.m. UTC | #2 
On Wed, Jul 07, 2021 at 04:41:42PM +0200, Philippe Mathieu-Daudé wrote:
> On 7/6/21 4:57 PM, Alex Bennée wrote:
> > From: Daniel P. Berrangé <berrange@redhat.com>
> > 
> > librados-dev is not required by QEMU directly, only librbd-dev.
> > 
> > glusterfs-common is not directly needed by QEMU.
> > 
> > QEMU uses ncursesw only on non-Windows hosts.
> > 
> > The clang package is clang 10.
> > 
> > flex and bison are not required by QEMU.
> 
> Doh, it was practical to cross-build Linux kernel images
> while testing:
> 
> $ make O=/tmp/build ARCH=mips CROSS_PREFIX=mipsel-linux-gnu- jazz_defconfig
> make[1]: Entering directory '/tmp/build'
>   GEN     Makefile
>   LEX     scripts/kconfig/lexer.lex.c
> /bin/sh: 1: flex: not found
> make[2]: *** [scripts/Makefile.host:9: scripts/kconfig/lexer.lex.c]
> Error 127
> 
> But I agree it is not required by QEMU itself.

Yeah, this feels out of scope for QEMU. If we want to make it easy
to build kernel images for testing with QEMU, we ought to have a
dedicated git repo with standard .config recipes and containers
with suitable build environments. There's no reason to deal with
that all in qemu.git that I see.

Regards,
Daniel
diff mbox series

Patch

diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index a50a35e6fe..ee8545e4b1 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -5,7 +5,6 @@  ENV PACKAGES \
     gcc \
     gettext \
     git \
-    glusterfs-common \
     libaio-dev \
     libattr1-dev \
     libbrlapi-dev \
@@ -24,12 +23,10 @@  ENV PACKAGES \
     libjemalloc-dev \
     libjpeg-turbo8-dev \
     liblzo2-dev \
-    libncurses5-dev \
     libncursesw5-dev \
     libnfs-dev \
     libnuma-dev \
     libpixman-1-dev \
-    librados-dev \
     librbd-dev \
     librdmacm-dev \
     libsasl2-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index eee2ef3cac..25f56adfb2 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -1,16 +1,13 @@ 
 FROM docker.io/library/ubuntu:20.04
 ENV PACKAGES \
-    bison \
     bsdmainutils \
     ccache \
-    clang-10\
-    flex \
+    clang \
     gcc \
     gcovr \
     genisoimage \
     gettext \
     git \
-    glusterfs-common \
     libaio-dev \
     libattr1-dev \
     libbrlapi-dev \
@@ -30,12 +27,10 @@  ENV PACKAGES \
     libjpeg-turbo8-dev \
     liblttng-ust-dev \
     liblzo2-dev \
-    libncurses5-dev \
     libncursesw5-dev \
     libnfs-dev \
     libnuma-dev \
     libpixman-1-dev \
-    librados-dev \
     librbd-dev \
     librdmacm-dev \
     libsasl2-dev \
@@ -53,7 +48,7 @@  ENV PACKAGES \
     libxen-dev \
     libzstd-dev \
     make \
-    netcat-openbsd \
+    ncat \
     ninja-build \
     python3-numpy \
     python3-opencv \
@@ -67,7 +62,6 @@  ENV PACKAGES \
     sparse \
     tesseract-ocr \
     tesseract-ocr-eng \
-    vim \
     xfslibs-dev
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES