mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-23 11:39:53 +00:00
tests/lcitool: Refresh submodule and remove libxml2
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> Message-Id: <20220204204335.1689602-10-alex.bennee@linaro.org>
This commit is contained in:
parent
9e8be4c546
commit
dabee8381a
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
|
|||||||
NINJA='/usr/local/bin/ninja'
|
NINJA='/usr/local/bin/ninja'
|
||||||
PACKAGING_COMMAND='pkg'
|
PACKAGING_COMMAND='pkg'
|
||||||
PIP3='/usr/local/bin/pip-3.8'
|
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=''
|
PYPI_PKGS=''
|
||||||
PYTHON='/usr/local/bin/python3'
|
PYTHON='/usr/local/bin/python3'
|
||||||
|
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
|
|||||||
NINJA='/usr/local/bin/ninja'
|
NINJA='/usr/local/bin/ninja'
|
||||||
PACKAGING_COMMAND='pkg'
|
PACKAGING_COMMAND='pkg'
|
||||||
PIP3='/usr/local/bin/pip-3.8'
|
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=''
|
PYPI_PKGS=''
|
||||||
PYTHON='/usr/local/bin/python3'
|
PYTHON='/usr/local/bin/python3'
|
||||||
|
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
|
|||||||
NINJA='/usr/local/bin/ninja'
|
NINJA='/usr/local/bin/ninja'
|
||||||
PACKAGING_COMMAND='brew'
|
PACKAGING_COMMAND='brew'
|
||||||
PIP3='/usr/local/bin/pip3'
|
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'
|
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv'
|
||||||
PYTHON='/usr/local/bin/python3'
|
PYTHON='/usr/local/bin/python3'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# THIS FILE WAS AUTO-GENERATED
|
# THIS FILE WAS AUTO-GENERATED
|
||||||
#
|
#
|
||||||
# $ lcitool dockerfile alpine-edge qemu
|
# $ lcitool dockerfile --layers all alpine-edge qemu
|
||||||
#
|
#
|
||||||
# https://gitlab.com/libvirt/libvirt-ci
|
# https://gitlab.com/libvirt/libvirt-ci
|
||||||
|
|
||||||
@ -56,7 +56,6 @@ RUN apk update && \
|
|||||||
libtasn1-dev \
|
libtasn1-dev \
|
||||||
liburing-dev \
|
liburing-dev \
|
||||||
libusb-dev \
|
libusb-dev \
|
||||||
libxml2-dev \
|
|
||||||
linux-pam-dev \
|
linux-pam-dev \
|
||||||
llvm11 \
|
llvm11 \
|
||||||
lttng-ust-dev \
|
lttng-ust-dev \
|
||||||
@ -109,6 +108,7 @@ RUN apk update && \
|
|||||||
zlib-dev \
|
zlib-dev \
|
||||||
zlib-static \
|
zlib-static \
|
||||||
zstd-dev && \
|
zstd-dev && \
|
||||||
|
apk list | sort > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
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/c++ && \
|
||||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# THIS FILE WAS AUTO-GENERATED
|
# THIS FILE WAS AUTO-GENERATED
|
||||||
#
|
#
|
||||||
# $ lcitool dockerfile centos-8 qemu
|
# $ lcitool dockerfile --layers all centos-8 qemu
|
||||||
#
|
#
|
||||||
# https://gitlab.com/libvirt/libvirt-ci
|
# https://gitlab.com/libvirt/libvirt-ci
|
||||||
|
|
||||||
@ -69,10 +69,8 @@ RUN dnf update -y && \
|
|||||||
libssh-devel \
|
libssh-devel \
|
||||||
libtasn1-devel \
|
libtasn1-devel \
|
||||||
libubsan \
|
libubsan \
|
||||||
libudev-devel \
|
|
||||||
liburing-devel \
|
liburing-devel \
|
||||||
libusbx-devel \
|
libusbx-devel \
|
||||||
libxml2-devel \
|
|
||||||
libzstd-devel \
|
libzstd-devel \
|
||||||
llvm \
|
llvm \
|
||||||
lttng-ust-devel \
|
lttng-ust-devel \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# THIS FILE WAS AUTO-GENERATED
|
# THIS FILE WAS AUTO-GENERATED
|
||||||
#
|
#
|
||||||
# $ lcitool dockerfile fedora-35 qemu
|
# $ lcitool dockerfile --layers all fedora-35 qemu
|
||||||
#
|
#
|
||||||
# https://gitlab.com/libvirt/libvirt-ci
|
# https://gitlab.com/libvirt/libvirt-ci
|
||||||
|
|
||||||
@ -77,10 +77,8 @@ exec "$@"' > /usr/bin/nosync && \
|
|||||||
libssh-devel \
|
libssh-devel \
|
||||||
libtasn1-devel \
|
libtasn1-devel \
|
||||||
libubsan \
|
libubsan \
|
||||||
libudev-devel \
|
|
||||||
liburing-devel \
|
liburing-devel \
|
||||||
libusbx-devel \
|
libusbx-devel \
|
||||||
libxml2-devel \
|
|
||||||
libzstd-devel \
|
libzstd-devel \
|
||||||
llvm \
|
llvm \
|
||||||
lttng-ust-devel \
|
lttng-ust-devel \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# THIS FILE WAS AUTO-GENERATED
|
# 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
|
# https://gitlab.com/libvirt/libvirt-ci
|
||||||
|
|
||||||
@ -71,7 +71,6 @@ RUN zypper update -y && \
|
|||||||
libudev-devel \
|
libudev-devel \
|
||||||
liburing-devel \
|
liburing-devel \
|
||||||
libusb-1_0-devel \
|
libusb-1_0-devel \
|
||||||
libxml2-devel \
|
|
||||||
libzstd-devel \
|
libzstd-devel \
|
||||||
llvm \
|
llvm \
|
||||||
lttng-ust-devel \
|
lttng-ust-devel \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# THIS FILE WAS AUTO-GENERATED
|
# THIS FILE WAS AUTO-GENERATED
|
||||||
#
|
#
|
||||||
# $ lcitool dockerfile ubuntu-1804 qemu
|
# $ lcitool dockerfile --layers all ubuntu-1804 qemu
|
||||||
#
|
#
|
||||||
# https://gitlab.com/libvirt/libvirt-ci
|
# https://gitlab.com/libvirt/libvirt-ci
|
||||||
|
|
||||||
@ -89,7 +89,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||||||
libvirglrenderer-dev \
|
libvirglrenderer-dev \
|
||||||
libvte-2.91-dev \
|
libvte-2.91-dev \
|
||||||
libxen-dev \
|
libxen-dev \
|
||||||
libxml2-dev \
|
|
||||||
libzstd-dev \
|
libzstd-dev \
|
||||||
llvm \
|
llvm \
|
||||||
locales \
|
locales \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# THIS FILE WAS AUTO-GENERATED
|
# THIS FILE WAS AUTO-GENERATED
|
||||||
#
|
#
|
||||||
# $ lcitool dockerfile ubuntu-2004 qemu
|
# $ lcitool dockerfile --layers all ubuntu-2004 qemu
|
||||||
#
|
#
|
||||||
# https://gitlab.com/libvirt/libvirt-ci
|
# https://gitlab.com/libvirt/libvirt-ci
|
||||||
|
|
||||||
@ -91,7 +91,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||||||
libvirglrenderer-dev \
|
libvirglrenderer-dev \
|
||||||
libvte-2.91-dev \
|
libvte-2.91-dev \
|
||||||
libxen-dev \
|
libxen-dev \
|
||||||
libxml2-dev \
|
|
||||||
libzstd-dev \
|
libzstd-dev \
|
||||||
llvm \
|
llvm \
|
||||||
locales \
|
locales \
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd
|
Subproject commit 6dd9b6fab1fe081b16bc975485d7a02c81ba5fbe
|
@ -63,7 +63,6 @@ packages:
|
|||||||
- liburing
|
- liburing
|
||||||
- libusbx
|
- libusbx
|
||||||
- libvdeplug
|
- libvdeplug
|
||||||
- libxml2
|
|
||||||
- libzstd
|
- libzstd
|
||||||
- llvm
|
- llvm
|
||||||
- lttng-ust
|
- lttng-ust
|
||||||
|
Loading…
Reference in New Issue
Block a user