| Message ID | 20220124201608.604599-10-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing and plugin updates | expand |
On 24/01/2022 21.15, Alex Bennée wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > The previous commit removed all uses of libxml2. > > Refresh lcitool submodule, update qemu.yml and refresh the generated > files by running: > > $ make lcitool-refresh > > Note: This refreshment also removes libudev dependency on Fedora > and CentOS due to libvirt-ci commit 18bfaee ("mappings: Improve > mapping for libudev"), since "The udev project has been absorbed > by the systemd project", and lttng-ust on FreeBSD runners due to > libvirt-ci commit 6dd9b6f ("guests: drop lttng-ust from FreeBSD > platform"). > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20220121154134.315047-6-f4bug@amsat.org> > --- > .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- > .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- > .gitlab-ci.d/cirrus/macos-11.vars | 2 +- > tests/docker/dockerfiles/alpine.docker | 4 ++-- > tests/docker/dockerfiles/centos8.docker | 4 +--- > tests/docker/dockerfiles/fedora.docker | 4 +--- > tests/docker/dockerfiles/opensuse-leap.docker | 3 +-- > tests/docker/dockerfiles/ubuntu1804.docker | 3 +-- > tests/docker/dockerfiles/ubuntu2004.docker | 3 +-- > tests/lcitool/libvirt-ci | 2 +- > tests/lcitool/projects/qemu.yml | 1 - > 11 files changed, 11 insertions(+), 19 deletions(-) > > diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars > index 9c52266811..07f313aa3a 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 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness 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 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 p5-Test-Harness 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 7b44dba324..8a648dda1e 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 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness 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 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 p5-Test-Harness 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' Seems like this now also added fusefs-libs3 on FreeBSD which causes the build to break: https://gitlab.com/thuth/qemu/-/jobs/2012083924#L3454 Any ideas how to best fix this? Thomas
On 1/25/22 11:23, Thomas Huth wrote: > On 24/01/2022 21.15, Alex Bennée wrote: >> From: Philippe Mathieu-Daudé <f4bug@amsat.org> >> >> The previous commit removed all uses of libxml2. >> >> Refresh lcitool submodule, update qemu.yml and refresh the generated >> files by running: >> >> $ make lcitool-refresh >> >> Note: This refreshment also removes libudev dependency on Fedora >> and CentOS due to libvirt-ci commit 18bfaee ("mappings: Improve >> mapping for libudev"), since "The udev project has been absorbed >> by the systemd project", and lttng-ust on FreeBSD runners due to >> libvirt-ci commit 6dd9b6f ("guests: drop lttng-ust from FreeBSD >> platform"). >> >> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> Message-Id: <20220121154134.315047-6-f4bug@amsat.org> >> --- >> .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- >> .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- >> .gitlab-ci.d/cirrus/macos-11.vars | 2 +- >> tests/docker/dockerfiles/alpine.docker | 4 ++-- >> tests/docker/dockerfiles/centos8.docker | 4 +--- >> tests/docker/dockerfiles/fedora.docker | 4 +--- >> tests/docker/dockerfiles/opensuse-leap.docker | 3 +-- >> tests/docker/dockerfiles/ubuntu1804.docker | 3 +-- >> tests/docker/dockerfiles/ubuntu2004.docker | 3 +-- >> tests/lcitool/libvirt-ci | 2 +- >> tests/lcitool/projects/qemu.yml | 1 - >> 11 files changed, 11 insertions(+), 19 deletions(-) >> >> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars >> b/.gitlab-ci.d/cirrus/freebsd-12.vars >> index 9c52266811..07f313aa3a 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 gettext >> git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt >> libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm >> lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness 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 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 p5-Test-Harness 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 7b44dba324..8a648dda1e 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 gettext >> git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt >> libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm >> lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness 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 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 p5-Test-Harness 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' > > Seems like this now also added fusefs-libs3 on FreeBSD which causes the > build to break: > > https://gitlab.com/thuth/qemu/-/jobs/2012083924#L3454 > > Any ideas how to best fix this? Candidate patch: https://lore.kernel.org/qemu-devel/20220124220357.74017-1-f4bug@amsat.org/
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 9c52266811..07f313aa3a 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 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness 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 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 p5-Test-Harness 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 7b44dba324..8a648dda1e 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 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness 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 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 p5-Test-Harness 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/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars index 613d1373c2..08183f8793 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 cpanminus 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 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' +PKGS='bash bc bzip2 capstone ccache cpanminus 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' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' PYTHON='/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index eb2251c81c..591af43d60 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile alpine-edge qemu +# $ lcitool dockerfile --layers all alpine-edge qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -56,7 +56,6 @@ RUN apk update && \ libtasn1-dev \ liburing-dev \ libusb-dev \ - libxml2-dev \ linux-pam-dev \ llvm11 \ lttng-ust-dev \ @@ -109,6 +108,7 @@ RUN apk update && \ zlib-dev \ zlib-static \ zstd-dev && \ + apk list | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index cbb909d02b..3abac7a8b1 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-8 qemu +# $ lcitool dockerfile --layers all centos-8 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -69,10 +69,8 @@ RUN dnf update -y && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 60207f3da3..1d01cd9440 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-35 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -77,10 +77,8 @@ exec "$@"' > /usr/bin/nosync && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ 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 f57d8cfb29..1b78d8369a 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-leap-152 qemu +# $ lcitool dockerfile --layers all opensuse-leap-152 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -71,7 +71,6 @@ 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 0ffa3c4d4b..003ee2cfed 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-1804 qemu +# $ lcitool dockerfile --layers all ubuntu-1804 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -89,7 +89,6 @@ 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 4e562dfdcd..8993d2d9e0 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-2004 qemu +# $ lcitool dockerfile --layers all ubuntu-2004 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -91,7 +91,6 @@ 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 29cec2153b..6dd9b6fab1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd +Subproject commit 6dd9b6fab1fe081b16bc975485d7a02c81ba5fbe diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index ed5ab1407a..de51a2f1dd 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -63,7 +63,6 @@ packages: - liburing - libusbx - libvdeplug - - libxml2 - libzstd - llvm - lttng-ust