motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

libvirt-ci: bump to latest for vulkan-tools

Browse source 
The alpine baseline has also been updated in the meantime so we need
to address that while we are at it.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250304222439.2035603-12-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2025-03-04 22:24:18 +00:00
parent ed557cc544
commit 4748be5e9d
24 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.d/cirrus/freebsd-14.vars
View file

@ -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' PIP3='/usr/local/bin/pip'
PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso zstd' PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 vulkan-tools xorriso zstd'
PYPI_PKGS='' PYPI_PKGS=''
PYTHON='/usr/local/bin/python3' PYTHON='/usr/local/bin/python3'

2
.gitlab-ci.d/cirrus/macos-14.vars
View file

@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja' NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew' PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3' PIP3='/opt/homebrew/bin/pip3'
PKGS='bash bc bindgen bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' PKGS='bash bc bindgen bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 vulkan-tools xorriso zlib zstd'
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli'
PYTHON='/opt/homebrew/bin/python3' PYTHON='/opt/homebrew/bin/python3'

1
scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
View file

@ -123,6 +123,7 @@ packages:
- tar - tar
- tesseract-ocr - tesseract-ocr
- tesseract-ocr-eng - tesseract-ocr-eng
- vulkan-tools
- xorriso - xorriso
- zlib1g-dev - zlib1g-dev
- zstd - zstd

1
scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
View file

@ -121,6 +121,7 @@ packages:
- tar - tar
- tesseract-ocr - tesseract-ocr
- tesseract-ocr-eng - tesseract-ocr-eng
- vulkan-tools
- xorriso - xorriso
- zlib1g-dev - zlib1g-dev
- zstd - zstd

5
tests/docker/dockerfiles/alpine.docker
View file

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all alpine-319 qemu # $ lcitool dockerfile --layers all alpine-321 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/alpine:3.19 FROM docker.io/library/alpine:3.21
RUN apk update && \ RUN apk update && \
apk upgrade && \ apk upgrade && \
@ -111,6 +111,7 @@ RUN apk update && \
vde2-dev \ vde2-dev \
virglrenderer-dev \ virglrenderer-dev \
vte3-dev \ vte3-dev \
vulkan-tools \
which \ which \
xen-dev \ xen-dev \
xorriso \ xorriso \

1
tests/docker/dockerfiles/centos9.docker
View file

@ -115,6 +115,7 @@ RUN dnf distro-sync -y && \
usbredir-devel \ usbredir-devel \
util-linux \ util-linux \
vte291-devel \ vte291-devel \
vulkan-tools \
which \ which \
xorriso \ xorriso \
zlib-devel \ zlib-devel \

3
tests/docker/dockerfiles/debian-amd64-cross.docker
View file

@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zstd && \ zstd && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -135,7 +136,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsndio-dev:amd64 \ libsndio-dev:amd64 \
libspice-protocol-dev:amd64 \ libspice-protocol-dev:amd64 \
libspice-server-dev:amd64 \ libspice-server-dev:amd64 \
libssh-gcrypt-dev:amd64 \ libssh-dev:amd64 \
libsystemd-dev:amd64 \ libsystemd-dev:amd64 \
libtasn1-6-dev:amd64 \ libtasn1-6-dev:amd64 \
libubsan1:amd64 \ libubsan1:amd64 \

3
tests/docker/dockerfiles/debian-arm64-cross.docker
View file

@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zstd && \ zstd && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsndio-dev:arm64 \ libsndio-dev:arm64 \
libspice-protocol-dev:arm64 \ libspice-protocol-dev:arm64 \
libspice-server-dev:arm64 \ libspice-server-dev:arm64 \
libssh-gcrypt-dev:arm64 \ libssh-dev:arm64 \
libsystemd-dev:arm64 \ libsystemd-dev:arm64 \
libtasn1-6-dev:arm64 \ libtasn1-6-dev:arm64 \
libubsan1:arm64 \ libubsan1:arm64 \

3
tests/docker/dockerfiles/debian-armhf-cross.docker
View file

@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zstd && \ zstd && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsndio-dev:armhf \ libsndio-dev:armhf \
libspice-protocol-dev:armhf \ libspice-protocol-dev:armhf \
libspice-server-dev:armhf \ libspice-server-dev:armhf \
libssh-gcrypt-dev:armhf \ libssh-dev:armhf \
libsystemd-dev:armhf \ libsystemd-dev:armhf \
libtasn1-6-dev:armhf \ libtasn1-6-dev:armhf \
libubsan1:armhf \ libubsan1:armhf \

3
tests/docker/dockerfiles/debian-i686-cross.docker
View file

@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zstd && \ zstd && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsndio-dev:i386 \ libsndio-dev:i386 \
libspice-protocol-dev:i386 \ libspice-protocol-dev:i386 \
libspice-server-dev:i386 \ libspice-server-dev:i386 \
libssh-gcrypt-dev:i386 \ libssh-dev:i386 \
libsystemd-dev:i386 \ libsystemd-dev:i386 \
libtasn1-6-dev:i386 \ libtasn1-6-dev:i386 \
libubsan1:i386 \ libubsan1:i386 \

3
tests/docker/dockerfiles/debian-mips64el-cross.docker
View file

@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zstd && \ zstd && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsndio-dev:mips64el \ libsndio-dev:mips64el \
libspice-protocol-dev:mips64el \ libspice-protocol-dev:mips64el \
libspice-server-dev:mips64el \ libspice-server-dev:mips64el \
libssh-gcrypt-dev:mips64el \ libssh-dev:mips64el \
libsystemd-dev:mips64el \ libsystemd-dev:mips64el \
libtasn1-6-dev:mips64el \ libtasn1-6-dev:mips64el \
libudev-dev:mips64el \ libudev-dev:mips64el \

3
tests/docker/dockerfiles/debian-mipsel-cross.docker
View file

@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zstd && \ zstd && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsndio-dev:mipsel \ libsndio-dev:mipsel \
libspice-protocol-dev:mipsel \ libspice-protocol-dev:mipsel \
libspice-server-dev:mipsel \ libspice-server-dev:mipsel \
libssh-gcrypt-dev:mipsel \ libssh-dev:mipsel \
libsystemd-dev:mipsel \ libsystemd-dev:mipsel \
libtasn1-6-dev:mipsel \ libtasn1-6-dev:mipsel \
libudev-dev:mipsel \ libudev-dev:mipsel \

3
tests/docker/dockerfiles/debian-ppc64el-cross.docker
View file

@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zstd && \ zstd && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsndio-dev:ppc64el \ libsndio-dev:ppc64el \
libspice-protocol-dev:ppc64el \ libspice-protocol-dev:ppc64el \
libspice-server-dev:ppc64el \ libspice-server-dev:ppc64el \
libssh-gcrypt-dev:ppc64el \ libssh-dev:ppc64el \
libsystemd-dev:ppc64el \ libsystemd-dev:ppc64el \
libtasn1-6-dev:ppc64el \ libtasn1-6-dev:ppc64el \
libubsan1:ppc64el \ libubsan1:ppc64el \

3
tests/docker/dockerfiles/debian-s390x-cross.docker
View file

@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zstd && \ zstd && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \
@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsnappy-dev:s390x \ libsnappy-dev:s390x \
libsndio-dev:s390x \ libsndio-dev:s390x \
libspice-protocol-dev:s390x \ libspice-protocol-dev:s390x \
libssh-gcrypt-dev:s390x \ libssh-dev:s390x \
libsystemd-dev:s390x \ libsystemd-dev:s390x \
libtasn1-6-dev:s390x \ libtasn1-6-dev:s390x \
libubsan1:s390x \ libubsan1:s390x \

3
tests/docker/dockerfiles/debian.docker
View file

@ -87,7 +87,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libsndio-dev \ libsndio-dev \
libspice-protocol-dev \ libspice-protocol-dev \
libspice-server-dev \ libspice-server-dev \
libssh-gcrypt-dev \ libssh-dev \
libsystemd-dev \ libsystemd-dev \
libtasn1-6-dev \ libtasn1-6-dev \
libubsan1 \ libubsan1 \
@ -131,6 +131,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zlib1g-dev \ zlib1g-dev \
zstd && \ zstd && \

1
tests/docker/dockerfiles/fedora-rust-nightly.docker
View file

@ -132,6 +132,7 @@ exec "$@"\n' > /usr/bin/nosync && \
util-linux \ util-linux \
virglrenderer-devel \ virglrenderer-devel \
vte291-devel \ vte291-devel \
vulkan-tools \
which \ which \
xen-devel \ xen-devel \
xorriso \ xorriso \

1
tests/docker/dockerfiles/fedora-win64-cross.docker
View file

@ -61,6 +61,7 @@ exec "$@"\n' > /usr/bin/nosync && \
tesseract \ tesseract \
tesseract-langpack-eng \ tesseract-langpack-eng \
util-linux \ util-linux \
vulkan-tools \
which \ which \
xorriso \ xorriso \
zstd && \ zstd && \

1
tests/docker/dockerfiles/fedora.docker
View file

@ -132,6 +132,7 @@ exec "$@"\n' > /usr/bin/nosync && \
util-linux \ util-linux \
virglrenderer-devel \ virglrenderer-devel \
vte291-devel \ vte291-devel \
vulkan-tools \
which \ which \
xen-devel \ xen-devel \
xorriso \ xorriso \

1
tests/docker/dockerfiles/opensuse-leap.docker
View file

@ -115,6 +115,7 @@ RUN zypper update -y && \
util-linux \ util-linux \
virglrenderer-devel \ virglrenderer-devel \
vte-devel \ vte-devel \
vulkan-tools \
which \ which \
xen-devel \ xen-devel \
xorriso \ xorriso \

1
tests/docker/dockerfiles/ubuntu2204.docker
View file

@ -130,6 +130,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vulkan-tools \
xorriso \ xorriso \
zlib1g-dev \ zlib1g-dev \
zstd && \ zstd && \

2
tests/lcitool/libvirt-ci

@ -1 +1 @@
Subproject commit b6a65806bc9b2b56985f5e97c936b77c7e7a99fc Subproject commit 18c4bfe02c467e5639bf9a687139735ccd7a3fff

1
tests/lcitool/projects/qemu.yml
View file

@ -122,6 +122,7 @@ packages:
- usbredir - usbredir
- virglrenderer - virglrenderer
- vte - vte
- vulkan-tools
- which - which
- xen - xen
- xorriso - xorriso

2
tests/lcitool/refresh
View file

@ -163,7 +163,7 @@ try:
# #
# Standard native builds # Standard native builds
# #
generate_dockerfile("alpine", "alpine-319") generate_dockerfile("alpine", "alpine-321")
generate_dockerfile("centos9", "centos-stream-9") generate_dockerfile("centos9", "centos-stream-9")
generate_dockerfile("debian", "debian-12", generate_dockerfile("debian", "debian-12",
trailer="".join(debian12_extras)) trailer="".join(debian12_extras))

1
tests/vm/generated/freebsd.json
View file

@ -73,6 +73,7 @@
"usbredir", "usbredir",
"virglrenderer", "virglrenderer",
"vte3", "vte3",
"vulkan-tools",
"xorriso", "xorriso",
"zstd" "zstd"
], ],