[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 6/7] tests/lcitool: Remove libxml2
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 6/7] tests/lcitool: Remove libxml2 |
Date: |
Thu, 20 Jan 2022 12:30:15 +0100 |
The previous commit removed all uses of libxml2.
Update lcitool's qemu.yml and refresh the generated files by running:
$ make lcitool-refresh
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 | 1 -
tests/docker/dockerfiles/centos8.docker | 1 -
tests/docker/dockerfiles/fedora.docker | 1 -
tests/docker/dockerfiles/opensuse-leap.docker | 1 -
tests/docker/dockerfiles/ubuntu1804.docker | 1 -
tests/docker/dockerfiles/ubuntu2004.docker | 1 -
tests/lcitool/projects/qemu.yml | 1 -
10 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars
b/.gitlab-ci.d/cirrus/freebsd-12.vars
index bdcce578edf..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 fusefs-libs3 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 ee610c89fe1..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 fusefs-libs3 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 9d7f74fc51e..591af43d60e 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -56,7 +56,6 @@ RUN apk update && \
libtasn1-dev \
liburing-dev \
libusb-dev \
- libxml2-dev \
linux-pam-dev \
llvm11 \
lttng-ust-dev \
diff --git a/tests/docker/dockerfiles/centos8.docker
b/tests/docker/dockerfiles/centos8.docker
index fde6a036263..3abac7a8b13 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -71,7 +71,6 @@ RUN dnf update -y && \
libubsan \
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 82f504e40d6..1d01cd94405 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -79,7 +79,6 @@ exec "$@"' > /usr/bin/nosync && \
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 30e7038148a..1b78d8369a7 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -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 7ebaab82b97..699f2dfc6a9 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -90,7 +90,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 b93707b70d4..87513125b8e 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -92,7 +92,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/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 948b9912579..958868a6ee9 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -64,7 +64,6 @@ packages:
- liburing
- libusbx
- libvdeplug
- - libxml2
- libzstd
- llvm
- lttng-ust
--
2.34.1
- [PATCH v3 0/7] tests: Refresh lcitool submodule & remove libxml2, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 3/7] tests: Refresh lcitool submodule, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 2/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 7/7] tests: Manually remove libxml2 on MSYS2 runners, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 4/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation, Philippe Mathieu-Daudé, 2022/01/20
- [PATCH v3 6/7] tests/lcitool: Remove libxml2,
Philippe Mathieu-Daudé <=
- [PATCH v3 5/7] drop libxml2 checks since libxml is not actually used (for parallels), Philippe Mathieu-Daudé, 2022/01/20