Failed in applying to current master (
apply log)
Maintainers: Ed Maste <emaste@freebsd.org>, Li-Wen Hsu <lwhsu@freebsd.org>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>, Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>
docs/conf.py | 13 ----------
configure | 8 +++---
meson.build | 2 +-
.gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
.gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
.gitlab-ci.d/cirrus/macos-12.vars | 2 +-
.gitlab-ci.d/windows.yml | 5 ++--
scripts/ci/setup/build-environment.yml | 1 -
scripts/shaderinclude.pl | 16 ------------
scripts/shaderinclude.py | 26 +++++++++++++++++++
tests/docker/dockerfiles/alpine.docker | 2 --
tests/docker/dockerfiles/centos8.docker | 2 --
.../dockerfiles/debian-amd64-cross.docker | 4 +--
tests/docker/dockerfiles/debian-amd64.docker | 2 --
.../dockerfiles/debian-arm64-cross.docker | 4 +--
.../dockerfiles/debian-armel-cross.docker | 4 +--
.../dockerfiles/debian-armhf-cross.docker | 4 +--
.../dockerfiles/debian-mips64el-cross.docker | 4 +--
.../dockerfiles/debian-mipsel-cross.docker | 4 +--
.../dockerfiles/debian-ppc64el-cross.docker | 4 +--
.../dockerfiles/debian-s390x-cross.docker | 4 +--
.../dockerfiles/debian-toolchain.docker | 1 -
.../dockerfiles/debian-tricore-cross.docker | 1 -
.../dockerfiles/fedora-win32-cross.docker | 6 ++---
.../dockerfiles/fedora-win64-cross.docker | 6 ++---
tests/docker/dockerfiles/fedora.docker | 6 ++---
tests/docker/dockerfiles/opensuse-leap.docker | 2 --
tests/docker/dockerfiles/ubuntu2004.docker | 2 --
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/projects/qemu.yml | 2 --
tests/lcitool/refresh | 6 ++---
tests/qapi-schema/meson.build | 7 ++---
tests/vm/centos.aarch64 | 2 +-
33 files changed, 58 insertions(+), 100 deletions(-)
delete mode 100644 scripts/shaderinclude.pl
create mode 100644 scripts/shaderinclude.py