* [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2
@ 2022-01-21 13:02 Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-21 13:02 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Michael Tokarev, Thomas Huth,
Daniel P . Berrangé, Philippe Mathieu-Daudé
Series fully reviewed.
Refresh lcitool to latest and remove libxml2 (mjt).
v5:
- update scripts/meson-buildoptions.sh (thuth)
- squash libvirt-ci updates (thuth)
v4:
- Fixed typos and cleaned checkpatch.pl (thuth)
- Corrected libvirt-ci submodule URL
v3:
- fix 'refresh' helper to update cirrus-ci files (danpb)
v2:
- rebased (testing/next)
- include mjt's libxml2 removal patch
Michael Tokarev (1):
drop libxml2 checks since libxml is not actually used (for parallels)
Philippe Mathieu-Daudé (6):
MAINTAINERS: Cover lcitool submodule with build test / automation
gitmodules: Correct libvirt-ci submodule URL
tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files
tests/lcitool: Refresh submodule and remove libxml2
tests: Manually remove libxml2 on MSYS2 runners
tests/lcitool: Install libibumad to cover RDMA on Debian based distros
meson.build | 6 ------
.cirrus.yml | 1 -
.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 --
.gitmodules | 2 +-
MAINTAINERS | 1 +
block/meson.build | 3 +--
meson_options.txt | 2 --
scripts/checkpatch.pl | 1 -
scripts/ci/org.centos/stream/8/x86_64/configure | 1 -
scripts/coverity-scan/coverity-scan.docker | 1 -
scripts/coverity-scan/run-coverity-scan | 2 +-
scripts/meson-buildoptions.sh | 3 ---
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 | 4 ++--
tests/docker/dockerfiles/ubuntu2004.docker | 4 ++--
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/projects/qemu.yml | 2 +-
tests/lcitool/refresh | 2 +-
24 files changed, 19 insertions(+), 41 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v5 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation
2022-01-21 13:02 [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
@ 2022-01-21 13:02 ` Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 2/7] gitmodules: Correct libvirt-ci submodule URL Philippe Mathieu-Daudé via
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-21 13:02 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Michael Tokarev, Thomas Huth,
Daniel P . Berrangé, Philippe Mathieu-Daudé
lcitool is used by build test / automation, we want maintainers
to get notified if the submodule is updated.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index e4b3a4bcdf4..6d5539d46f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3579,6 +3579,7 @@ F: .travis.yml
F: scripts/ci/
F: tests/docker/
F: tests/vm/
+F: tests/lcitool/
F: scripts/archive-source.sh
W: https://gitlab.com/qemu-project/qemu/pipelines
W: https://travis-ci.org/qemu/qemu
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 2/7] gitmodules: Correct libvirt-ci submodule URL
2022-01-21 13:02 [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
@ 2022-01-21 13:02 ` Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Philippe Mathieu-Daudé via
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-21 13:02 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Michael Tokarev, Thomas Huth,
Daniel P . Berrangé, Philippe Mathieu-Daudé
Correct the libvirt-ci repository URL to avoid this warning when
cloning / refreshing the submodule:
warning: redirecting to https://gitlab.com/libvirt/libvirt-ci.git/
Fixes: 4ebb040f1fd ("tests: integrate lcitool for generating build env manifests")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitmodules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitmodules b/.gitmodules
index 84425d87e28..f4b6a9b4012 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -66,4 +66,4 @@
url = https://gitlab.com/qemu-project/vbootrom.git
[submodule "tests/lcitool/libvirt-ci"]
path = tests/lcitool/libvirt-ci
- url = http://gitlab.com/libvirt/libvirt-ci
+ url = https://gitlab.com/libvirt/libvirt-ci.git
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files
2022-01-21 13:02 [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 2/7] gitmodules: Correct libvirt-ci submodule URL Philippe Mathieu-Daudé via
@ 2022-01-21 13:02 ` Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 4/7] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-21 13:02 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Michael Tokarev, Thomas Huth,
Daniel P . Berrangé, Philippe Mathieu-Daudé
The script only include the local qemu.yml for Dockerfiles.
Since we want to keep the Cirrus-CI generated files in sync,
also use the --data-dir option in generate_cirrus().
Fixes: c45a540f4bd (".gitlab-ci.d/cirrus: auto-generate variables with lcitool")
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/lcitool/refresh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 033120e223d..25301f2ef0b 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None, trailer=None):
def generate_cirrus(target, trailer=None):
filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
- cmd = [lcitool_path, "variables", target, "qemu"]
+ cmd = lcitool_cmd + ["variables", target, "qemu"]
generate(filename, cmd, trailer)
ubuntu1804_skipssh = [
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 4/7] drop libxml2 checks since libxml is not actually used (for parallels)
2022-01-21 13:02 [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
` (2 preceding siblings ...)
2022-01-21 13:02 ` [PATCH v5 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Philippe Mathieu-Daudé via
@ 2022-01-21 13:02 ` Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 5/7] tests/lcitool: Refresh submodule and remove libxml2 Philippe Mathieu-Daudé via
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-21 13:02 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Michael Tokarev, Thomas Huth,
Daniel P . Berrangé,
Stefan Hajnoczi, Philippe Mathieu-Daudé
From: Michael Tokarev <mjt@tls.msk.ru>
For a long time, we assumed that libxml2 is necessary for parallels
block format support (block/parallels*). However, this format actually
does not use libxml [*]. Since this is the only user of libxml2 in
whole QEMU tree, we can drop all libxml2 checks and dependencies too.
It is even more: --enable-parallels configure option was the only
option which was silently ignored when it's (fake) dependency
(libxml2) isn't installed.
Drop all mentions of libxml2.
[*] Actually the basis for libxml use were introduced in commit
ed279a06c53 ("configure: add dependency") but the implementation
was never merged:
https://lore.kernel.org/qemu-devel/70227bbd-a517-70e9-714f-e6e0ec431be9@openvz.org/
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220119090423.149315-1-mjt@msgid.tls.msk.ru>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMD: Updated description and adapted to use lcitool]
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
meson.build | 6 ------
block/meson.build | 3 +--
meson_options.txt | 2 --
scripts/checkpatch.pl | 1 -
scripts/ci/org.centos/stream/8/x86_64/configure | 1 -
scripts/coverity-scan/coverity-scan.docker | 1 -
scripts/coverity-scan/run-coverity-scan | 2 +-
scripts/meson-buildoptions.sh | 3 ---
8 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/meson.build b/meson.build
index 333c61deba7..64a146e1d06 100644
--- a/meson.build
+++ b/meson.build
@@ -449,11 +449,6 @@
required: get_option('linux_io_uring'),
method: 'pkg-config', kwargs: static_kwargs)
endif
-libxml2 = not_found
-if not get_option('libxml2').auto() or have_block
- libxml2 = dependency('libxml-2.0', required: get_option('libxml2'),
- method: 'pkg-config', kwargs: static_kwargs)
-endif
libnfs = not_found
if not get_option('libnfs').auto() or have_block
libnfs = dependency('libnfs', version: '>=1.9.3',
@@ -3489,7 +3484,6 @@
summary_info += {'lzfse support': liblzfse}
summary_info += {'zstd support': zstd}
summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')}
-summary_info += {'libxml2': libxml2}
summary_info += {'capstone': capstone_opt == 'internal' ? capstone_opt : capstone}
summary_info += {'libpmem support': libpmem}
summary_info += {'libdaxctl support': libdaxctl}
diff --git a/block/meson.build b/block/meson.build
index deb73ca389f..90dc9983e56 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -58,8 +58,7 @@
'qed-table.c',
'qed.c',
))
-block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'],
- if_true: files('parallels.c', 'parallels-ext.c'))
+block_ss.add(when: 'CONFIG_PARALLELS', if_true: files('parallels.c', 'parallels-ext.c'))
block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c'))
block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit])
block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c'))
diff --git a/meson_options.txt b/meson_options.txt
index 921967eddbb..95d527f7732 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -113,8 +113,6 @@ option('libudev', type : 'feature', value : 'auto',
description: 'Use libudev to enumerate host devices')
option('libusb', type : 'feature', value : 'auto',
description: 'libusb support for USB passthrough')
-option('libxml2', type : 'feature', value : 'auto',
- description: 'libxml2 support for Parallels image format')
option('linux_aio', type : 'feature', value : 'auto',
description: 'Linux AIO support')
option('linux_io_uring', type : 'feature', value : 'auto',
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5caa739db48..5e501110601 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -307,7 +307,6 @@ sub help {
qr{target_(?:u)?long},
qr{hwaddr},
# external libraries
- qr{xml${Ident}},
qr{xen\w+_handle},
# Glib definitions
qr{gchar},
diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure
index e05f2fddcc2..9850dd44444 100755
--- a/scripts/ci/org.centos/stream/8/x86_64/configure
+++ b/scripts/ci/org.centos/stream/8/x86_64/configure
@@ -81,7 +81,6 @@
--disable-libssh \
--disable-libudev \
--disable-libusb \
---disable-libxml2 \
--disable-linux-aio \
--disable-linux-io-uring \
--disable-linux-user \
diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-scan/coverity-scan.docker
index ecff6ac5b4b..6f60a52d231 100644
--- a/scripts/coverity-scan/coverity-scan.docker
+++ b/scripts/coverity-scan/coverity-scan.docker
@@ -59,7 +59,6 @@ ENV PACKAGES \
libubsan \
libudev-devel \
libusbx-devel \
- libxml2-devel \
libzstd-devel \
llvm \
lzo-devel \
diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-scan/run-coverity-scan
index 6d443250a9b..181bdcb2638 100755
--- a/scripts/coverity-scan/run-coverity-scan
+++ b/scripts/coverity-scan/run-coverity-scan
@@ -402,7 +402,7 @@ echo "Configuring..."
--enable-libiscsi --enable-libnfs --enable-seccomp \
--enable-tpm --enable-libssh --enable-lzo --enable-snappy --enable-bzip2 \
--enable-numa --enable-rdma --enable-smartcard --enable-virglrenderer \
- --enable-mpath --enable-libxml2 --enable-glusterfs \
+ --enable-mpath --enable-glusterfs \
--enable-virtfs --enable-zstd
echo "Running cov-build..."
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index a4af02c5273..48a454cece2 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -58,7 +58,6 @@ meson_options_help() {
printf "%s\n" ' libssh ssh block device support'
printf "%s\n" ' libudev Use libudev to enumerate host devices'
printf "%s\n" ' libusb libusb support for USB passthrough'
- printf "%s\n" ' libxml2 libxml2 support for Parallels image format'
printf "%s\n" ' linux-aio Linux AIO support'
printf "%s\n" ' linux-io-uring Linux io_uring support'
printf "%s\n" ' lzfse lzfse support for DMG images'
@@ -188,8 +187,6 @@ _meson_option_parse() {
--disable-libudev) printf "%s" -Dlibudev=disabled ;;
--enable-libusb) printf "%s" -Dlibusb=enabled ;;
--disable-libusb) printf "%s" -Dlibusb=disabled ;;
- --enable-libxml2) printf "%s" -Dlibxml2=enabled ;;
- --disable-libxml2) printf "%s" -Dlibxml2=disabled ;;
--enable-linux-aio) printf "%s" -Dlinux_aio=enabled ;;
--disable-linux-aio) printf "%s" -Dlinux_aio=disabled ;;
--enable-linux-io-uring) printf "%s" -Dlinux_io_uring=enabled ;;
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 5/7] tests/lcitool: Refresh submodule and remove libxml2
2022-01-21 13:02 [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
` (3 preceding siblings ...)
2022-01-21 13:02 ` [PATCH v5 4/7] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
@ 2022-01-21 13:02 ` Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 6/7] tests: Manually remove libxml2 on MSYS2 runners Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 7/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
6 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-21 13:02 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Michael Tokarev, Thomas Huth,
Daniel P . Berrangé, Philippe Mathieu-Daudé
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".
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <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 9c52266811f..79469deb4f7 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 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'
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 7b44dba324e..331791103db 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 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'
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 613d1373c23..08183f8793c 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 eb2251c81c8..591af43d60e 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 cbb909d02b3..3abac7a8b13 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 60207f3da38..1d01cd94405 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 f57d8cfb299..1b78d8369a7 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 0ffa3c4d4b5..003ee2cfedd 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 4e562dfdcd3..8993d2d9e05 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 29cec2153b9..226c178a2a1 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd
+Subproject commit 226c178a2a1f077d7ee371680cc649c1591b0457
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index ed5ab1407a9..de51a2f1dd4 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
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 6/7] tests: Manually remove libxml2 on MSYS2 runners
2022-01-21 13:02 [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
` (4 preceding siblings ...)
2022-01-21 13:02 ` [PATCH v5 5/7] tests/lcitool: Refresh submodule and remove libxml2 Philippe Mathieu-Daudé via
@ 2022-01-21 13:02 ` Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 7/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
6 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-21 13:02 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Michael Tokarev, Thomas Huth,
Daniel P . Berrangé, Philippe Mathieu-Daudé
lcitool doesn't support MSYS2 targets, so manually remove
this now unnecessary library.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.cirrus.yml | 1 -
.gitlab-ci.d/windows.yml | 2 --
2 files changed, 3 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 02c43a074a1..7552d709745 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -32,7 +32,6 @@ windows_msys2_task:
mingw-w64-x86_64-libgcrypt
mingw-w64-x86_64-libpng
mingw-w64-x86_64-libssh
- mingw-w64-x86_64-libxml2
mingw-w64-x86_64-snappy
mingw-w64-x86_64-libusb
mingw-w64-x86_64-usbredir
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 62dd9ed8329..1df16303491 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -44,7 +44,6 @@ msys2-64bit:
mingw-w64-x86_64-libssh
mingw-w64-x86_64-libtasn1
mingw-w64-x86_64-libusb
- mingw-w64-x86_64-libxml2
mingw-w64-x86_64-nettle
mingw-w64-x86_64-ninja
mingw-w64-x86_64-pixman
@@ -80,7 +79,6 @@ msys2-32bit:
mingw-w64-i686-libssh
mingw-w64-i686-libtasn1
mingw-w64-i686-libusb
- mingw-w64-i686-libxml2
mingw-w64-i686-lzo2
mingw-w64-i686-ninja
mingw-w64-i686-pixman
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 7/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros
2022-01-21 13:02 [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
` (5 preceding siblings ...)
2022-01-21 13:02 ` [PATCH v5 6/7] tests: Manually remove libxml2 on MSYS2 runners Philippe Mathieu-Daudé via
@ 2022-01-21 13:02 ` Philippe Mathieu-Daudé via
6 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-21 13:02 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Michael Tokarev, Thomas Huth,
Daniel P . Berrangé, Philippe Mathieu-Daudé
On Debian we also need libibumad to enable RDMA:
$ ../configure --enable-rdma
ERROR: OpenFabrics librdmacm/libibverbs/libibumad not present.
Your options:
(1) Fast: Install infiniband packages (devel) from your distro.
(2) Cleanest: Install libraries from www.openfabrics.org
(3) Also: Install softiwarp if you don't have RDMA hardware
Add the dependency to lcitool's qemu.yml (where librdmacm and
libibverbs are already listed) and refresh the generated files
by running:
$ make lcitool-refresh
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/docker/dockerfiles/ubuntu1804.docker | 1 +
tests/docker/dockerfiles/ubuntu2004.docker | 1 +
tests/lcitool/projects/qemu.yml | 1 +
3 files changed, 3 insertions(+)
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 003ee2cfedd..699f2dfc6a9 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libglib2.0-dev \
libgnutls28-dev \
libgtk-3-dev \
+ libibumad-dev \
libibverbs-dev \
libiscsi-dev \
libjemalloc-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 8993d2d9e05..87513125b8e 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -53,6 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libglusterfs-dev \
libgnutls28-dev \
libgtk-3-dev \
+ libibumad-dev \
libibverbs-dev \
libiscsi-dev \
libjemalloc-dev \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index de51a2f1dd4..958868a6ee9 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -43,6 +43,7 @@ packages:
- libfdt
- libffi
- libgcrypt
+ - libibumad
- libibverbs
- libiscsi
- libjemalloc
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-01-21 14:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-21 13:02 [PATCH v5 0/7] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 2/7] gitmodules: Correct libvirt-ci submodule URL Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 4/7] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 5/7] tests/lcitool: Refresh submodule and remove libxml2 Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 6/7] tests: Manually remove libxml2 on MSYS2 runners Philippe Mathieu-Daudé via
2022-01-21 13:02 ` [PATCH v5 7/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
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.