marcandre.lur...@redhat.com writes:
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
I'm not sure how but this is re-breaking the windows build you just fixed:
In file included from
/usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl.h:46,
from /tmp/qemu-test/src/include/ui/egl-helpers.h:5,
from /tmp/qemu-test/src/include/ui/gtk.h:25,
from ../src/ui/gtk.c:42:
/usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl_generated.h:11:10:
fatal error: EGL/eglplatform.h: No such file or directory
11 | #include "EGL/eglplatform.h"
| ^~~~~~~~~~~~~~~~~~~
compilation terminated.
I'm going to drop this patch for now.
> ---
> .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
> .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
> .gitlab-ci.d/cirrus/macos-12.vars | 2 +-
> tests/docker/dockerfiles/alpine.docker | 1 -
> tests/docker/dockerfiles/centos8.docker | 1 -
> tests/docker/dockerfiles/debian-amd64-cross.docker | 3 +--
> tests/docker/dockerfiles/debian-amd64.docker | 1 -
> tests/docker/dockerfiles/debian-arm64-cross.docker | 3 +--
> tests/docker/dockerfiles/debian-armel-cross.docker | 3 +--
> tests/docker/dockerfiles/debian-armhf-cross.docker | 3 +--
> tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 +--
> tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 +--
> tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 +--
> tests/docker/dockerfiles/debian-s390x-cross.docker | 3 +--
> tests/docker/dockerfiles/debian-toolchain.docker | 1 -
> tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
> tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
> tests/docker/dockerfiles/fedora.docker | 1 -
> tests/docker/dockerfiles/opensuse-leap.docker | 1 -
> tests/docker/dockerfiles/ubuntu2004.docker | 1 -
> tests/lcitool/projects/qemu.yml | 1 -
> 21 files changed, 11 insertions(+), 29 deletions(-)
>
> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars
> b/.gitlab-ci.d/cirrus/freebsd-12.vars
> index f32f01a954..8934e5d57f 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 bison bzip2 ca_root_nss capstone4 ccache
> cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex
> fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi
> libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm
> lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy
> py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3
> rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo
> usbredir virglrenderer vte3 zstd'
> +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache
> cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex
> fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi
> libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm
> lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy
> py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3
> rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract 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 813c051616..65ce456c48 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 bison bzip2 ca_root_nss capstone4 ccache
> cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex
> fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi
> libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm
> lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy
> py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3
> rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo
> usbredir virglrenderer vte3 zstd'
> +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache
> cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex
> fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi
> libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm
> lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy
> py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3
> rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir
> virglrenderer vte3 zstd'
> PYPI_PKGS=''
> PYTHON='/usr/local/bin/python3'
> diff --git a/.gitlab-ci.d/cirrus/macos-12.vars
> b/.gitlab-ci.d/cirrus/macos-12.vars
> index 33bb4e1040..65b78fa08f 100644
> --- a/.gitlab-ci.d/cirrus/macos-12.vars
> +++ b/.gitlab-ci.d/cirrus/macos-12.vars
> @@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
> NINJA='/opt/homebrew/bin/ninja'
> PACKAGING_COMMAND='brew'
> PIP3='/opt/homebrew/bin/pip3'
> -PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils
> dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo
> json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh
> libtasn1 libusb llvm lzo make meson ncurses nettle ninja 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 cmocka ctags curl dbus diffutils
> dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo
> json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh
> libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config
> python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract
> usbredir vde vte3 zlib zstd'
> PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme'
> PYTHON='/opt/homebrew/bin/python3'
> diff --git a/tests/docker/dockerfiles/alpine.docker
> b/tests/docker/dockerfiles/alpine.docker
> index 3293c790c9..4a569d82f6 100644
> --- a/tests/docker/dockerfiles/alpine.docker
> +++ b/tests/docker/dockerfiles/alpine.docker
> @@ -99,7 +99,6 @@ RUN apk update && \
> spice-protocol \
> tar \
> tesseract-ocr \
> - texinfo \
> usbredir-dev \
> util-linux \
> vde2-dev \
> diff --git a/tests/docker/dockerfiles/centos8.docker
> b/tests/docker/dockerfiles/centos8.docker
> index f13745e6cc..fbc953c6dc 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -110,7 +110,6 @@ RUN dnf distro-sync -y && \
> systemd-devel \
> systemtap-sdt-devel \
> tar \
> - texinfo \
> usbredir-devel \
> util-linux \
> virglrenderer-devel \
> diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker
> b/tests/docker/dockerfiles/debian-amd64-cross.docker
> index d0ace6d0f7..5175095a85 100644
> --- a/tests/docker/dockerfiles/debian-amd64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
> @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> sparse \
> tar \
> tesseract-ocr \
> - tesseract-ocr-eng \
> - texinfo && \
> + tesseract-ocr-eng && \
> eatmydata apt-get autoremove -y && \
> eatmydata apt-get autoclean -y && \
> sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> diff --git a/tests/docker/dockerfiles/debian-amd64.docker
> b/tests/docker/dockerfiles/debian-amd64.docker
> index 0517c4c315..b61f664ea2 100644
> --- a/tests/docker/dockerfiles/debian-amd64.docker
> +++ b/tests/docker/dockerfiles/debian-amd64.docker
> @@ -125,7 +125,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> tar \
> tesseract-ocr \
> tesseract-ocr-eng \
> - texinfo \
> xfslibs-dev \
> zlib1g-dev && \
> eatmydata apt-get autoremove -y && \
> diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker
> b/tests/docker/dockerfiles/debian-arm64-cross.docker
> index 9ac1c1ba3f..b69958c69f 100644
> --- a/tests/docker/dockerfiles/debian-arm64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
> @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> sparse \
> tar \
> tesseract-ocr \
> - tesseract-ocr-eng \
> - texinfo && \
> + tesseract-ocr-eng && \
> eatmydata apt-get autoremove -y && \
> eatmydata apt-get autoclean -y && \
> sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker
> b/tests/docker/dockerfiles/debian-armel-cross.docker
> index 8be492f4ad..96b524fab6 100644
> --- a/tests/docker/dockerfiles/debian-armel-cross.docker
> +++ b/tests/docker/dockerfiles/debian-armel-cross.docker
> @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> sparse \
> tar \
> tesseract-ocr \
> - tesseract-ocr-eng \
> - texinfo && \
> + tesseract-ocr-eng && \
> eatmydata apt-get autoremove -y && \
> eatmydata apt-get autoclean -y && \
> sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker
> b/tests/docker/dockerfiles/debian-armhf-cross.docker
> index da789e04af..08a75cebdb 100644
> --- a/tests/docker/dockerfiles/debian-armhf-cross.docker
> +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
> @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> sparse \
> tar \
> tesseract-ocr \
> - tesseract-ocr-eng \
> - texinfo && \
> + tesseract-ocr-eng && \
> eatmydata apt-get autoremove -y && \
> eatmydata apt-get autoclean -y && \
> sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker
> b/tests/docker/dockerfiles/debian-mips64el-cross.docker
> index 8b7c59c4f9..5930e6fa5d 100644
> --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
> @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> sparse \
> tar \
> tesseract-ocr \
> - tesseract-ocr-eng \
> - texinfo && \
> + tesseract-ocr-eng && \
> eatmydata apt-get autoremove -y && \
> eatmydata apt-get autoclean -y && \
> sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker
> b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> index f9f1ed5fd2..c65d9830e7 100644
> --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> sparse \
> tar \
> tesseract-ocr \
> - tesseract-ocr-eng \
> - texinfo && \
> + tesseract-ocr-eng && \
> eatmydata apt-get autoremove -y && \
> eatmydata apt-get autoclean -y && \
> sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> index e423d88c2d..2ae56c978e 100644
> --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> sparse \
> tar \
> tesseract-ocr \
> - tesseract-ocr-eng \
> - texinfo && \
> + tesseract-ocr-eng && \
> eatmydata apt-get autoremove -y && \
> eatmydata apt-get autoclean -y && \
> sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker
> b/tests/docker/dockerfiles/debian-s390x-cross.docker
> index c1134f4cec..0db86a0fcd 100644
> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
> @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> sparse \
> tar \
> tesseract-ocr \
> - tesseract-ocr-eng \
> - texinfo && \
> + tesseract-ocr-eng && \
> eatmydata apt-get autoremove -y && \
> eatmydata apt-get autoclean -y && \
> sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> diff --git a/tests/docker/dockerfiles/debian-toolchain.docker
> b/tests/docker/dockerfiles/debian-toolchain.docker
> index d3d4d3344e..6c73408b34 100644
> --- a/tests/docker/dockerfiles/debian-toolchain.docker
> +++ b/tests/docker/dockerfiles/debian-toolchain.docker
> @@ -21,7 +21,6 @@ RUN apt update && \
> libmpc-dev \
> libmpfr-dev \
> rsync \
> - texinfo \
> wget && \
> DEBIAN_FRONTEND=noninteractive eatmydata \
> apt build-dep -yy --arch-only gcc glibc
> diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker
> b/tests/docker/dockerfiles/fedora-win32-cross.docker
> index de811b332b..b659c0b8a8 100644
> --- a/tests/docker/dockerfiles/fedora-win32-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
> @@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \
> tar \
> tesseract \
> tesseract-langpack-eng \
> - texinfo \
> util-linux \
> which && \
> nosync dnf autoremove -y && \
> diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker
> b/tests/docker/dockerfiles/fedora-win64-cross.docker
> index 71681d6f92..0a404c15bf 100644
> --- a/tests/docker/dockerfiles/fedora-win64-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
> @@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \
> tar \
> tesseract \
> tesseract-langpack-eng \
> - texinfo \
> util-linux \
> which && \
> nosync dnf autoremove -y && \
> diff --git a/tests/docker/dockerfiles/fedora.docker
> b/tests/docker/dockerfiles/fedora.docker
> index ca3793b04b..5d60a96141 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -121,7 +121,6 @@ exec "$@"' > /usr/bin/nosync && \
> tar \
> tesseract \
> tesseract-langpack-eng \
> - texinfo \
> usbredir-devel \
> util-linux \
> virglrenderer-devel \
> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker
> b/tests/docker/dockerfiles/opensuse-leap.docker
> index 680f49e7dc..4b2c02d6ab 100644
> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> @@ -111,7 +111,6 @@ RUN zypper update -y && \
> tar \
> tesseract-ocr \
> tesseract-ocr-traineddata-english \
> - texinfo \
> usbredir-devel \
> util-linux \
> virglrenderer-devel \
> diff --git a/tests/docker/dockerfiles/ubuntu2004.docker
> b/tests/docker/dockerfiles/ubuntu2004.docker
> index 6594bba338..13ab0b6887 100644
> --- a/tests/docker/dockerfiles/ubuntu2004.docker
> +++ b/tests/docker/dockerfiles/ubuntu2004.docker
> @@ -124,7 +124,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> tar \
> tesseract-ocr \
> tesseract-ocr-eng \
> - texinfo \
> xfslibs-dev \
> zlib1g-dev && \
> eatmydata apt-get autoremove -y && \
> diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
> index c2af92348a..6467bcf08a 100644
> --- a/tests/lcitool/projects/qemu.yml
> +++ b/tests/lcitool/projects/qemu.yml
> @@ -109,7 +109,6 @@ packages:
> - tar
> - tesseract
> - tesseract-eng
> - - texinfo
> - usbredir
> - virglrenderer
> - vte
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
