From: Anton Johansson via <qemu-devel@nongnu.org>
To: "Alex Bennée" <alex.bennee@linaro.org>
Cc: ale@rev.ng, tsimpson@quicinc.com, bcain@quicinc.com,
mlambert@quicinc.com, babush@rev.ng, nizzo@rev.ng,
richard.henderson@linaro.org, qemu-devel@nongnu.org
Subject: Re: [PATCH v9 08/12] target/hexagon: import flex/bison to docker files
Date: Wed, 25 May 2022 14:29:16 +0200 [thread overview]
Message-ID: <952b8af1-486c-1e69-3ab2-42da0edb9fda@rev.ng> (raw)
In-Reply-To: <87h75f6xyd.fsf@linaro.org>
On 5/24/22 12:07, Alex Bennée wrote:
> Anton Johansson via <qemu-devel@nongnu.org> writes:
>
>> This patch points `tests/lcitool/libvirt-ci` to an upstreamed commit of
>> `libvirt-ci` which includes flex and bison. The `lcitool/refresh` script
>> was then ran to update the the generated docker/cirrus files.
>>
>> Signed-off-by: Alessandro Di Federico <ale@rev.ng>
>> Signed-off-by: Paolo Montesel <babush@rev.ng>
>> Signed-off-by: Anton Johansson <anjo@rev.ng>
>> ---
>> .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
>> .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
>> .gitlab-ci.d/cirrus/macos-11.vars | 2 +-
>> .gitlab-ci.d/windows.yml | 2 ++
>> tests/docker/dockerfiles/alpine.docker | 6 ++++--
>> tests/docker/dockerfiles/centos8.docker | 7 ++++---
>> tests/docker/dockerfiles/debian-amd64.docker | 2 ++
>> .../dockerfiles/debian-arm64-cross.docker | 6 ++++--
>> tests/docker/dockerfiles/debian-native.docker | 3 +++
>> .../dockerfiles/debian-riscv64-cross.docker | 3 +++
>> .../dockerfiles/debian-s390x-cross.docker | 6 ++++--
>> .../dockerfiles/debian-tricore-cross.docker | 1 +
>> tests/docker/dockerfiles/debian10.docker | 3 +++
>> .../dockerfiles/fedora-i386-cross.docker | 3 +++
>> .../dockerfiles/fedora-win32-cross.docker | 3 +++
>> .../dockerfiles/fedora-win64-cross.docker | 3 +++
>> tests/docker/dockerfiles/fedora.docker | 5 +++--
>> tests/docker/dockerfiles/opensuse-leap.docker | 5 +++--
>> tests/docker/dockerfiles/ubuntu1804.docker | 4 +++-
>> tests/docker/dockerfiles/ubuntu2004.docker | 5 +++--
>> tests/lcitool/libvirt-ci | 2 +-
>> tests/lcitool/projects/qemu.yml | 20 ++++++++++---------
>> 22 files changed, 66 insertions(+), 29 deletions(-)
>>
>> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars
>> index b4842271b2..0cfe18c67c 100644
>> --- a/.gitlab-ci.d/cirrus/freebsd-12.vars
>> +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars
>> @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
>> NINJA='/usr/local/bin/ninja'
>> PACKAGING_COMMAND='pkg'
>> PIP3='/usr/local/bin/pip-3.8'
>> -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
>> +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc flex gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
>> PYPI_PKGS=''
>> PYTHON='/usr/local/bin/python3'
>> diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars
>> index 546a82dd75..33c8856fd4 100644
>> --- a/.gitlab-ci.d/cirrus/freebsd-13.vars
>> +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars
>> @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
>> NINJA='/usr/local/bin/ninja'
>> PACKAGING_COMMAND='pkg'
>> PIP3='/usr/local/bin/pip-3.8'
>> -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
>> +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc flex gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
>> PYPI_PKGS=''
>> PYTHON='/usr/local/bin/python3'
> This is quite a lot of containers at once which makes it hard to review.
> Do we actually build hexagon on all these various containers anyway?
>
> Either way I'd be tempted to update one container per patch.
>
>> diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars
>> index cfe9181fd4..1c7366c810 100644
>> --- a/.gitlab-ci.d/cirrus/macos-11.vars
>> +++ b/.gitlab-ci.d/cirrus/macos-11.vars
>> @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
>> NINJA='/usr/local/bin/ninja'
>> PACKAGING_COMMAND='brew'
>> PIP3='/usr/local/bin/pip3'
>> -PKGS='bash bc bzip2 capstone ccache ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
>> +PKGS='bash bc bison bzip2 capstone ccache ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
>> PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv'
>> PYTHON='/usr/local/bin/python3'
>> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
>> index 1df1630349..b496109b89 100644
>> --- a/.gitlab-ci.d/windows.yml
>> +++ b/.gitlab-ci.d/windows.yml
>> @@ -33,6 +33,7 @@ msys2-64bit:
>> script:
>> - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
>> diffutils git grep make sed
>> + flex bison
>> mingw-w64-x86_64-capstone
>> mingw-w64-x86_64-curl
>> mingw-w64-x86_64-cyrus-sasl
>> @@ -67,6 +68,7 @@ msys2-32bit:
>> script:
>> - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
>> diffutils git grep make sed
>> + flex bison
>> mingw-w64-i686-capstone
>> mingw-w64-i686-curl
>> mingw-w64-i686-cyrus-sasl
>> diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
>> index 3f4c0f95cb..ad5785be0f 100644
>> --- a/tests/docker/dockerfiles/alpine.docker
>> +++ b/tests/docker/dockerfiles/alpine.docker
>> @@ -13,6 +13,7 @@ RUN apk update && \
>> attr-dev \
>> bash \
>> bc \
>> + bison \
>> bzip2 \
>> bzip2-dev \
>> ca-certificates \
>> @@ -29,7 +30,7 @@ RUN apk update && \
>> dtc-dev \
>> eudev-dev \
>> findutils \
>> - fuse3-dev \
> Why has this dropped?
>
>> + flex \
>> g++ \
>> gcc \
>> gcovr \
>> @@ -50,12 +51,12 @@ RUN apk update && \
>> libnfs-dev \
>> libpng-dev \
>> libseccomp-dev \
>> - libselinux-dev \
> Or this
>
>> libslirp-dev \
>> libssh-dev \
>> libtasn1-dev \
>> liburing-dev \
>> libusb-dev \
>> + libxml2-dev \
> this isn't flex/bison
>
>> linux-pam-dev \
>> llvm11 \
>> lttng-ust-dev \
>> @@ -64,6 +65,7 @@ RUN apk update && \
>> mesa-dev \
>> meson \
>> multipath-tools \
>> + musl-dev \
> ?
>
>> ncurses-dev \
>> ndctl-dev \
>> net-tools \
>> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
>> index 4b20925bbf..b51114d542 100644
>> --- a/tests/docker/dockerfiles/centos8.docker
>> +++ b/tests/docker/dockerfiles/centos8.docker
>> @@ -6,7 +6,7 @@
>>
>> FROM quay.io/centos/centos:stream8
>>
>> -RUN dnf update -y && \
>> +RUN dnf distro-sync -y && \
>> dnf install 'dnf-command(config-manager)' -y && \
>> dnf config-manager --set-enabled -y powertools && \
>> dnf install -y centos-release-advanced-virtualization && \
>> @@ -16,6 +16,7 @@ RUN dnf update -y && \
>> alsa-lib-devel \
>> bash \
>> bc \
>> + bison \
>> brlapi-devel \
>> bzip2 \
>> bzip2-devel \
>> @@ -30,7 +31,7 @@ RUN dnf update -y && \
>> device-mapper-multipath-devel \
>> diffutils \
>> findutils \
>> - fuse3-devel \
> ?
>
>> + flex \
>> gcc \
>> gcc-c++ \
>> genisoimage \
>> @@ -64,13 +65,13 @@ RUN dnf update -y && \
>> libpng-devel \
>> librbd-devel \
>> libseccomp-devel \
>> - libselinux-devel \
> ?
>
>> libslirp-devel \
>> libssh-devel \
>> libtasn1-devel \
>> libubsan \
>> liburing-devel \
>> libusbx-devel \
>> + libxml2-devel \
>> libzstd-devel \
>> llvm \
>> lttng-ust-devel \
>> diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
>> index ed546edcd6..805fd6f981 100644
>> --- a/tests/docker/dockerfiles/debian-amd64.docker
>> +++ b/tests/docker/dockerfiles/debian-amd64.docker
>> @@ -14,9 +14,11 @@ RUN apt update && \
>> RUN apt update && \
>> DEBIAN_FRONTEND=noninteractive eatmydata \
>> apt install -y --no-install-recommends \
>> + bison \
>> cscope \
>> genisoimage \
>> exuberant-ctags \
>> + flex \
>> global \
>> libbz2-dev \
>> liblzo2-dev \
>> diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
>> index b60426834c..e42bde8bc3 100644
>> --- a/tests/docker/dockerfiles/debian-arm64-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
>> @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> eatmydata apt-get install --no-install-recommends -y \
>> bash \
>> bc \
>> + bison \
>> bsdextrautils \
>> bzip2 \
>> ca-certificates \
>> @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> diffutils \
>> exuberant-ctags \
>> findutils \
>> + flex \
>> gcovr \
>> genisoimage \
>> gettext \
>> git \
>> hostname \
>> + libglib2.0-dev \
> ?
>
>> libpcre2-dev \
>> libspice-protocol-dev \
>> llvm \
>> @@ -90,7 +93,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libepoxy-dev:arm64 \
>> libfdt-dev:arm64 \
>> libffi-dev:arm64 \
>> - libfuse3-dev:arm64 \
>> libgbm-dev:arm64 \
>> libgcrypt20-dev:arm64 \
>> libglib2.0-dev:arm64 \
>> @@ -117,7 +119,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libsdl2-dev:arm64 \
>> libsdl2-image-dev:arm64 \
>> libseccomp-dev:arm64 \
>> - libselinux1-dev:arm64 \
> ?
>
>> libslirp-dev:arm64 \
>> libsnappy-dev:arm64 \
>> libspice-server-dev:arm64 \
>> @@ -133,6 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libvirglrenderer-dev:arm64 \
>> libvte-2.91-dev:arm64 \
>> libxen-dev:arm64 \
>> + libxml2-dev:arm64 \
> ?
>
>> libzstd-dev:arm64 \
>> nettle-dev:arm64 \
>> systemtap-sdt-dev:arm64 \
>> diff --git a/tests/docker/dockerfiles/debian-native.docker b/tests/docker/dockerfiles/debian-native.docker
>> index efd55cb6e0..02ccaf98fd 100644
>> --- a/tests/docker/dockerfiles/debian-native.docker
>> +++ b/tests/docker/dockerfiles/debian-native.docker
>> @@ -26,13 +26,16 @@ RUN apt update && \
>> RUN apt update && \
>> DEBIAN_FRONTEND=noninteractive eatmydata \
>> apt install -y --no-install-recommends \
>> + bison \
>> cscope \
>> genisoimage \
>> exuberant-ctags \
>> + flex \
>> global \
>> libbz2-dev \
>> liblzo2-dev \
>> libgcrypt20-dev \
>> + libglib2.0-dev \
> ?
>> libfdt-dev \
>> librdmacm-dev \
>> libsasl2-dev \
>> diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker
>> index 594d97982c..f5553afc2e 100644
>> --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
>> @@ -17,12 +17,15 @@ RUN apt update && \
>> # Install common build utilities
>> RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
>> bc \
>> + bison \
>> 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-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
>> index ff79a2cc4f..1a304260fe 100644
>> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
>> @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> eatmydata apt-get install --no-install-recommends -y \
>> bash \
>> bc \
>> + bison \
>> bsdextrautils \
>> bzip2 \
>> ca-certificates \
>> @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> diffutils \
>> exuberant-ctags \
>> findutils \
>> + flex \
>> gcovr \
>> genisoimage \
>> gettext \
>> git \
>> hostname \
>> + libglib2.0-dev \
>> libpcre2-dev \
>> libspice-protocol-dev \
>> llvm \
>> @@ -90,7 +93,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libepoxy-dev:s390x \
>> libfdt-dev:s390x \
>> libffi-dev:s390x \
>> - libfuse3-dev:s390x \
>> libgbm-dev:s390x \
>> libgcrypt20-dev:s390x \
>> libglib2.0-dev:s390x \
>> @@ -117,7 +119,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libsdl2-dev:s390x \
>> libsdl2-image-dev:s390x \
>> libseccomp-dev:s390x \
>> - libselinux1-dev:s390x \
>> libslirp-dev:s390x \
>> libsnappy-dev:s390x \
>> libssh-gcrypt-dev:s390x \
>> @@ -131,6 +132,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libvdeplug-dev:s390x \
>> libvirglrenderer-dev:s390x \
>> libvte-2.91-dev:s390x \
>> + libxml2-dev:s390x \
>> libzstd-dev:s390x \
>> nettle-dev:s390x \
>> systemtap-sdt-dev:s390x \
>> diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
>> index b573b9ded2..203e096ea3 100644
>> --- a/tests/docker/dockerfiles/debian-tricore-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
>> @@ -20,6 +20,7 @@ RUN apt update && \
>> bzip2 \
>> ca-certificates \
>> ccache \
>> + flex \
>> g++ \
>> gcc \
>> git \
>> diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
>> index b414af1b9f..23285e7aa4 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..ebda006003 100644
>> --- a/tests/docker/dockerfiles/fedora-i386-cross.docker
>> +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
>> @@ -1,12 +1,15 @@
>> FROM registry.fedoraproject.org/fedora:34
>>
>> ENV PACKAGES \
>> + bison \
>> bzip2 \
>> ccache \
>> diffutils \
>> findutils \
>> + flex \
>> gcc \
>> git \
>> + glib2-devel \
>> libffi-devel.i686 \
>> libselinux-devel.i686 \
>> libtasn1-devel.i686 \
>> diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
>> index 84a8f5524d..c31d5ea544 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:33
>> # 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 d7ed8eb1cf..34ee496bc4 100644
>> --- a/tests/docker/dockerfiles/fedora-win64-cross.docker
>> +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
>> @@ -3,12 +3,15 @@ FROM registry.fedoraproject.org/fedora:33
>> # Please keep this list sorted alphabetically
>> ENV PACKAGES \
>> bc \
>> + bison \
>> bzip2 \
>> ccache \
>> diffutils \
>> findutils \
>> + flex \
>> gcc \
>> gettext \
>> + glib2-devel \
>> git \
>> hostname \
>> make \
>> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
>> index 2e6a84abfd..66f9b3263b 100644
>> --- a/tests/docker/dockerfiles/fedora.docker
>> +++ b/tests/docker/dockerfiles/fedora.docker
>> @@ -23,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \
>> alsa-lib-devel \
>> bash \
>> bc \
>> + bison \
>> brlapi-devel \
>> bzip2 \
>> bzip2-devel \
>> @@ -37,7 +38,7 @@ exec "$@"' > /usr/bin/nosync && \
>> device-mapper-multipath-devel \
>> diffutils \
>> findutils \
>> - fuse3-devel \
>> + flex \
>> gcc \
>> gcc-c++ \
>> gcovr \
>> @@ -72,13 +73,13 @@ exec "$@"' > /usr/bin/nosync && \
>> libpng-devel \
>> librbd-devel \
>> libseccomp-devel \
>> - libselinux-devel \
>> libslirp-devel \
>> libssh-devel \
>> libtasn1-devel \
>> libubsan \
>> liburing-devel \
>> libusbx-devel \
>> + libxml2-devel \
>> libzstd-devel \
>> llvm \
>> lttng-ust-devel \
>> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
>> index 6f5993d602..aab0bbe9e8 100644
>> --- a/tests/docker/dockerfiles/opensuse-leap.docker
>> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
>> @@ -12,6 +12,7 @@ RUN zypper update -y && \
>> alsa-lib-devel \
>> bash \
>> bc \
>> + bison \
>> brlapi-devel \
>> bzip2 \
>> ca-certificates \
>> @@ -22,7 +23,7 @@ RUN zypper update -y && \
>> dbus-1 \
>> diffutils \
>> findutils \
>> - fuse3-devel \
>> + flex \
>> gcc \
>> gcc-c++ \
>> gcovr \
>> @@ -63,7 +64,6 @@ RUN zypper update -y && \
>> libpulse-devel \
>> librbd-devel \
>> libseccomp-devel \
>> - libselinux-devel \
>> libspice-server-devel \
>> libssh-devel \
>> libtasn1-devel \
>> @@ -71,6 +71,7 @@ RUN zypper update -y && \
>> libudev-devel \
>> liburing-devel \
>> libusb-1_0-devel \
>> + libxml2-devel \
>> libzstd-devel \
>> llvm \
>> lttng-ust-devel \
>> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
>> index b3f2156580..b413c63129 100644
>> --- a/tests/docker/dockerfiles/ubuntu1804.docker
>> +++ b/tests/docker/dockerfiles/ubuntu1804.docker
>> @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> eatmydata apt-get install --no-install-recommends -y \
>> bash \
>> bc \
>> + bison \
>> bsdmainutils \
>> bzip2 \
>> ca-certificates \
>> @@ -23,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> diffutils \
>> exuberant-ctags \
>> findutils \
>> + flex \
>> g++ \
>> gcc \
>> gcovr \
>> @@ -74,7 +76,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libsdl2-dev \
>> libsdl2-image-dev \
>> libseccomp-dev \
>> - libselinux1-dev \
>> libsnappy-dev \
>> libspice-protocol-dev \
>> libspice-server-dev \
>> @@ -89,6 +90,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libvirglrenderer-dev \
>> libvte-2.91-dev \
>> libxen-dev \
>> + libxml2-dev \
>> libzstd-dev \
>> llvm \
>> locales \
>> diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
>> index a3b38884e3..f3d999b43f 100644
>> --- a/tests/docker/dockerfiles/ubuntu2004.docker
>> +++ b/tests/docker/dockerfiles/ubuntu2004.docker
>> @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> eatmydata apt-get install --no-install-recommends -y \
>> bash \
>> bc \
>> + bison \
>> bsdmainutils \
>> bzip2 \
>> ca-certificates \
>> @@ -23,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> diffutils \
>> exuberant-ctags \
>> findutils \
>> + flex \
>> g++ \
>> gcc \
>> gcovr \
>> @@ -46,7 +48,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libepoxy-dev \
>> libfdt-dev \
>> libffi-dev \
>> - libfuse3-dev \
>> libgbm-dev \
>> libgcrypt20-dev \
>> libglib2.0-dev \
>> @@ -75,7 +76,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libsdl2-dev \
>> libsdl2-image-dev \
>> libseccomp-dev \
>> - libselinux1-dev \
>> libslirp-dev \
>> libsnappy-dev \
>> libspice-protocol-dev \
>> @@ -91,6 +91,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>> libvirglrenderer-dev \
>> libvte-2.91-dev \
>> libxen-dev \
>> + libxml2-dev \
>> libzstd-dev \
>> llvm \
>> locales \
>> diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
>> index f83b916d5e..43927ff508 160000
>> --- a/tests/lcitool/libvirt-ci
>> +++ b/tests/lcitool/libvirt-ci
>> @@ -1 +1 @@
>> -Subproject commit f83b916d5efa4bd33fbf4b7ea41bf6d535cc63fb
>> +Subproject commit 43927ff508e8ecb1ac225dabbc95b37c890db917
>> diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
>> index d068a7a8de..1c2b03778c 100644
>> --- a/tests/lcitool/projects/qemu.yml
>> +++ b/tests/lcitool/projects/qemu.yml
>> @@ -3,6 +3,7 @@ packages:
>> - alsa
>> - bash
>> - bc
>> + - bison
>> - brlapi
>> - bzip2
>> - bzip2-libs
>> @@ -18,23 +19,24 @@ packages:
>> - diffutils
>> - dtrace
>> - findutils
>> - - fuse3
>> + - flex
>> - g++
>> - gcc
>> - gcovr
>> - - gettext
>> - genisoimage
>> + - gettext
>> - glib2
>> + - glib2-native
>> - glib2-static
>> - - glibc-static
>> - glusterfs
>> - gnutls
>> - gtk3
>> - hostname
>> - libaio
>> - - libattr
>> - libasan
>> + - libattr
>> - libbpf
>> + - libc-static
>> - libcacard
>> - libcap-ng
>> - libcurl
>> @@ -55,7 +57,6 @@ packages:
>> - librbd
>> - librdmacm
>> - libseccomp
>> - - libselinux
>> - libslirp
>> - libssh
>> - libtasn1
>> @@ -64,18 +65,19 @@ packages:
>> - liburing
>> - libusbx
>> - libvdeplug
>> + - libxml2
>> - libzstd
>> - llvm
>> - lttng-ust
>> - lzo
>> - - netcat
>> - - nettle
>> - - ninja
>> - - nsis
>> - make
>> - mesa-libgbm
>> - meson
>> - ncursesw
>> + - netcat
>> + - nettle
>> + - ninja
>> + - nsis
>> - pam
>> - pcre-static
>> - perl
> OK I've obviously missed some subtly here but this doesn't seem to be a
> just add flex/bison to the list of build tools we need.
>
Since the current commit of `libvirt-ci` in QEMU doesn't include package
mappings for flex/bison, we need to update to a more recent commit which
does.
This update includes ~50 commits worth of changes to `libvirt-ci`, which
is where all non flex/bison related changes to the docker/cirrus and
`qemu.yml` files comes from.
For clarity's sake, here are the exact steps taken to produce this patch:
1. Update QEMU's libvirt-ci to the commit
https://gitlab.com/libvirt/libvirt-ci/-/commit/43927ff508e8ecb1ac225dabbc95b37c890db917
which adds flex/bison, and a native glib2 (required since
idef-parser
is a build-time tool.)
2. Copy in new `tests/lcitool/projects/qemu.yml` from `libvirt-ci`
3. run `tests/lcitool/refresh` to generate new docker/cirrus files
Hope this helps! We can absolutely split this patch in multiple parts so
only one container is modified at a time. Although I think it makes sense to
keep them in a single patch since they are all auto-generated by the refresh
script.
--
Anton Johansson,
rev.ng Labs Srl.
next prev parent reply other threads:[~2022-05-25 12:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-22 17:40 [PATCH v9 00/12] target/hexagon: introduce idef-parser Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 01/12] target/hexagon: update MAINTAINERS for idef-parser Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 02/12] target/hexagon: import README " Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 03/12] target/hexagon: make slot number an unsigned Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 04/12] target/hexagon: make helper functions non-static Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 05/12] target/hexagon: introduce new helper functions Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 06/12] target/hexagon: expose next PC in DisasContext Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 07/12] target/hexagon: prepare input for the idef-parser Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 08/12] target/hexagon: import flex/bison to docker files Anton Johansson via
2022-05-24 10:07 ` Alex Bennée
2022-05-25 12:29 ` Anton Johansson via [this message]
2022-05-25 15:22 ` Richard Henderson
2022-05-25 16:38 ` Alex Bennée
2022-05-25 20:14 ` Anton Johansson via
2022-05-25 20:16 ` Richard Henderson
2022-05-25 20:27 ` Anton Johansson via
2022-05-25 21:05 ` Richard Henderson
2022-04-22 17:40 ` [PATCH v9 09/12] target/hexagon: import lexer for idef-parser Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 10/12] target/hexagon: import parser " Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 11/12] target/hexagon: call idef-parser functions Anton Johansson via
2022-04-22 17:40 ` [PATCH v9 12/12] target/hexagon: import additional tests Anton Johansson via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=952b8af1-486c-1e69-3ab2-42da0edb9fda@rev.ng \
--to=qemu-devel@nongnu.org \
--cc=ale@rev.ng \
--cc=alex.bennee@linaro.org \
--cc=anjo@rev.ng \
--cc=babush@rev.ng \
--cc=bcain@quicinc.com \
--cc=mlambert@quicinc.com \
--cc=nizzo@rev.ng \
--cc=richard.henderson@linaro.org \
--cc=tsimpson@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.