Re: [PATCH v11 10/15] target/hexagon: manually add flex/bison/glib2 to remaining containers

[Alex Bennée]

Anton Johansson <anjo@rev.ng> writes:

> Adds our build-time dependencies to containers which build qemu-hexagon,
> but aren't covered by libvirt-ci.
>
> Signed-off-by: Anton Johansson <anjo@rev.ng>
> ---
>  .gitlab-ci.d/windows.yml                             | 6 ++++--
>  tests/docker/dockerfiles/debian-riscv64-cross.docker | 3 +++
>  tests/docker/dockerfiles/debian-tricore-cross.docker | 1 +
>  tests/docker/dockerfiles/debian10.docker             | 3 +++

tricore doesn't build QEMU and debian10 went away in the last PR. To
avoid confusion as the rest of the patch set makes its way through I've
pulled 8, 9, and 10 into testing/next for my next PR.

>  tests/docker/dockerfiles/fedora-i386-cross.docker    | 2 ++
>  tests/docker/dockerfiles/fedora-win32-cross.docker   | 3 +++
>  tests/docker/dockerfiles/fedora-win64-cross.docker   | 3 +++
>  7 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
> index c4bde758be..17dbd35725 100644
> --- a/.gitlab-ci.d/windows.yml
> +++ b/.gitlab-ci.d/windows.yml
> @@ -33,7 +33,8 @@ msys2-64bit:
>    extends: .shared_msys2_builder
>    script:
>    - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
> -      diffutils git grep make sed
> +      bison diffutils flex
> +      git grep make sed
>        mingw-w64-x86_64-capstone
>        mingw-w64-x86_64-curl
>        mingw-w64-x86_64-cyrus-sasl
> @@ -68,7 +69,8 @@ msys2-32bit:
>    extends: .shared_msys2_builder
>    script:
>    - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
> -      diffutils git grep make sed
> +      bison diffutils flex
> +      git grep make sed
>        mingw-w64-i686-capstone
>        mingw-w64-i686-curl
>        mingw-w64-i686-cyrus-sasl
> diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker 
> b/tests/docker/dockerfiles/debian-riscv64-cross.docker
> index 594d97982c..9715791e0b 100644
> --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
> @@ -16,13 +16,16 @@ RUN apt update && \
>  
>  # Install common build utilities
>  RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
> +    bison \
>      bc \
>      build-essential \
>      ca-certificates \
>      debian-ports-archive-keyring \
>      dpkg-dev \
> +    flex \
>      gettext \
>      git \
> +    libglib2.0-dev \
>      ninja-build \
>      pkg-config \
>      python3
> diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker 
> b/tests/docker/dockerfiles/debian-tricore-cross.docker
> index b573b9ded2..63f977066c 100644
> --- a/tests/docker/dockerfiles/debian-tricore-cross.docker
> +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
> @@ -19,6 +19,7 @@ RUN apt update && \
>         bison \
>         bzip2 \
>         ca-certificates \
> +       flex \
>         ccache \
>         g++ \
>         gcc \
> diff --git a/tests/docker/dockerfiles/debian10.docker 
> b/tests/docker/dockerfiles/debian10.docker
> index 03be923066..1fc2fc1ddb 100644
> --- a/tests/docker/dockerfiles/debian10.docker
> +++ b/tests/docker/dockerfiles/debian10.docker
> @@ -18,15 +18,18 @@ RUN apt update && \
>      DEBIAN_FRONTEND=noninteractive eatmydata \
>      apt install -y --no-install-recommends \
>          bc \
> +        bison \
>          build-essential \
>          ca-certificates \
>          ccache \
>          clang \
>          dbus \
> +        flex \
>          gdb-multiarch \
>          gettext \
>          git \
>          libffi-dev \
> +        libglib2.0-dev \
>          libncurses5-dev \
>          ninja-build \
>          pkg-config \
> diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker 
> b/tests/docker/dockerfiles/fedora-i386-cross.docker
> index 0a3ec346e6..7eec648d2d 100644
> --- a/tests/docker/dockerfiles/fedora-i386-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
> @@ -1,9 +1,11 @@
>  FROM registry.fedoraproject.org/fedora:34
>  
>  ENV PACKAGES \
> +    bison \
>      bzip2 \
>      ccache \
>      diffutils \
> +    flex \
>      findutils \
>      gcc \
>      git \
> diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker 
> b/tests/docker/dockerfiles/fedora-win32-cross.docker
> index a06bd29e8e..aca37aabc4 100644
> --- a/tests/docker/dockerfiles/fedora-win32-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
> @@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35
>  # Please keep this list sorted alphabetically
>  ENV PACKAGES \
>      bc \
> +    bison \
>      bzip2 \
>      ccache \
>      diffutils \
>      findutils \
> +    flex \
>      gcc \
>      gettext \
>      git \
> +    glib2-devel \
>      hostname \
>      make \
>      meson \
> diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker 
> b/tests/docker/dockerfiles/fedora-win64-cross.docker
> index b71624330f..3642766479 100644
> --- a/tests/docker/dockerfiles/fedora-win64-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
> @@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35
>  # Please keep this list sorted alphabetically
>  ENV PACKAGES \
>      bc \
> +    bison \
>      bzip2 \
>      ccache \
>      diffutils \
>      findutils \
> +    flex \
>      gcc \
>      gettext \
>      git \
> +    glib2-devel \
>      hostname \
>      make \
>      meson \


-- 
Alex Bennée