* [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps
@ 2023-01-10 8:02 marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 1/8] build-sys: fix crlf-ending C code marcandre.lureau
` (8 more replies)
0 siblings, 9 replies; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Hi,
Fix the shader compilation error on win32/msys2 and convert the related script
from perl to python. Drop unneeded dependencies from lcitool project.
v3:
- split lcitool & f37 update
- fix sed portability usage, add back trailing $ in the regex
- add some patches to drop texinfo references/deps
v2:
- add a few patches to drop perl from the build dependencies
- add some tags for v1 patches
- add copyright header to the python script
Marc-André Lureau (8):
build-sys: fix crlf-ending C code
.gitlab-ci.d/windows: do not disable opengl
configure: replace Perl usage with sed
meson: replace Perl usage with Python
docs: drop texinfo options
Update lcitool and fedora to 37
lcitool: drop perl from QEMU project/dependencies
lcitool: drop texinfo from QEMU project/dependencies
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-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 +-
32 files changed, 58 insertions(+), 99 deletions(-)
delete mode 100644 scripts/shaderinclude.pl
create mode 100755 scripts/shaderinclude.py
--
2.39.0
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v3 1/8] build-sys: fix crlf-ending C code
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
@ 2023-01-10 8:02 ` marcandre.lureau
2023-01-10 8:33 ` Thomas Huth
2023-01-10 8:02 ` [PATCH v3 2/8] .gitlab-ci.d/windows: do not disable opengl marcandre.lureau
` (7 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
On msys2, the shader-to-C script produces bad C:
./ui/shader/texture-blit-vert.h:2:5: error: missing terminating " character [-Werror]
Fix it by changing the line ending from crlf to lf, and convert the
script to Python (qemu build seems perl-free after that).
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
---
meson.build | 2 +-
scripts/shaderinclude.pl | 16 ----------------
scripts/shaderinclude.py | 26 ++++++++++++++++++++++++++
3 files changed, 27 insertions(+), 17 deletions(-)
delete mode 100644 scripts/shaderinclude.pl
create mode 100755 scripts/shaderinclude.py
diff --git a/meson.build b/meson.build
index 175517eafd..b3c6db8343 100644
--- a/meson.build
+++ b/meson.build
@@ -2781,7 +2781,7 @@ config_host_data.set('CONFIG_SLIRP', slirp.found())
genh += configure_file(output: 'config-host.h', configuration: config_host_data)
hxtool = find_program('scripts/hxtool')
-shaderinclude = find_program('scripts/shaderinclude.pl')
+shaderinclude = find_program('scripts/shaderinclude.py')
qapi_gen = find_program('scripts/qapi-gen.py')
qapi_gen_depends = [ meson.current_source_dir() / 'scripts/qapi/__init__.py',
meson.current_source_dir() / 'scripts/qapi/commands.py',
diff --git a/scripts/shaderinclude.pl b/scripts/shaderinclude.pl
deleted file mode 100644
index cd3bb40b12..0000000000
--- a/scripts/shaderinclude.pl
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-
-my $file = shift;
-open FILE, "<", $file or die "open $file: $!";
-my $name = $file;
-$name =~ s|.*/||;
-$name =~ s/[-.]/_/g;
-print "static GLchar ${name}_src[] =\n";
-while (<FILE>) {
- chomp;
- printf " \"%s\\n\"\n", $_;
-}
-print " \"\\n\";\n";
-close FILE;
diff --git a/scripts/shaderinclude.py b/scripts/shaderinclude.py
new file mode 100755
index 0000000000..ab2aade2cd
--- /dev/null
+++ b/scripts/shaderinclude.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2023 Red Hat, Inc.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import sys
+import os
+
+
+def main(args):
+ file_path = args[1]
+ basename = os.path.basename(file_path)
+ varname = basename.replace('-', '_').replace('.', '_')
+
+ with os.fdopen(sys.stdout.fileno(), "wt", closefd=False, newline='\n') as stdout:
+ with open(file_path, "r", encoding='utf-8') as file:
+ print(f'static GLchar {varname}_src[] =', file=stdout)
+ for line in file:
+ line = line.rstrip()
+ print(f' "{line}\\n"', file=stdout)
+ print(' "\\n";', file=stdout)
+
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
--
2.39.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 2/8] .gitlab-ci.d/windows: do not disable opengl
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 1/8] build-sys: fix crlf-ending C code marcandre.lureau
@ 2023-01-10 8:02 ` marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 3/8] configure: replace Perl usage with sed marcandre.lureau
` (6 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The previous patch should fix shader compilation.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/windows.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index a1d5790580..cf445b77f6 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -71,7 +71,7 @@ msys2-64bit:
# for the msys2 64-bit job, due to the build could not complete within
# the project timeout.
- ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu
- --without-default-devices --disable-opengl'
+ --without-default-devices'
- ..\msys64\usr\bin\bash -lc 'make'
# qTests don't run successfully with "--without-default-devices",
# so let's exclude the qtests from CI for now.
@@ -113,8 +113,7 @@ msys2-32bit:
- $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
- mkdir output
- cd output
- - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu
- --disable-opengl'
+ - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu'
- ..\msys64\usr\bin\bash -lc 'make'
- ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=\"--no-suite qtest\" ||
{ cat meson-logs/testlog.txt; exit 1; }'
--
2.39.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 3/8] configure: replace Perl usage with sed
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 1/8] build-sys: fix crlf-ending C code marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 2/8] .gitlab-ci.d/windows: do not disable opengl marcandre.lureau
@ 2023-01-10 8:02 ` marcandre.lureau
2023-01-10 8:50 ` Thomas Huth
2023-01-10 8:02 ` [PATCH v3 4/8] meson: replace Perl usage with Python marcandre.lureau
` (5 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Let's try to reduce our Perl usage during config/build-time.
Note: this patch might be dropped if "configure: remove
backwards-compatibility code" is merged earlier.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
configure | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 2281892657..9a944698b4 100755
--- a/configure
+++ b/configure
@@ -2571,11 +2571,9 @@ else
if test -f meson-private/cmd_line.txt; then
# Adjust old command line options whose type was changed
# Avoids having to use "setup --wipe" when Meson is upgraded
- perl -i -ne '
- s/^gettext = true$/gettext = auto/;
- s/^gettext = false$/gettext = disabled/;
- /^b_staticpic/ && next;
- print;' meson-private/cmd_line.txt
+ sed -i.bak -e 's/^gettext = true$/gettext = auto/g' \
+ -e 's/^gettext = false$/gettext = disabled/g' \
+ -e '/^b_staticpic/d' meson-private/cmd_line.txt
fi
fi
--
2.39.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 4/8] meson: replace Perl usage with Python
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (2 preceding siblings ...)
2023-01-10 8:02 ` [PATCH v3 3/8] configure: replace Perl usage with sed marcandre.lureau
@ 2023-01-10 8:02 ` marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 5/8] docs: drop texinfo options marcandre.lureau
` (4 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Let's try to remove Perl usage during build time.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/qapi-schema/meson.build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index 9dfe98bc9a..d85b14f28c 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -259,22 +259,23 @@ if build_docs
# Fix possible inconsistency in line endings in generated output and
# in the golden reference (which could otherwise cause test failures
# on Windows hosts). Unfortunately diff --strip-trailing-cr
- # is GNU-diff only. The odd-looking perl is because we must avoid
+ # is GNU-diff only. The odd-looking python is because we must avoid
# using an explicit '\' character in the command arguments to
# a custom_target(), as Meson will unhelpfully replace it with a '/'
# (https://github.com/mesonbuild/meson/issues/1564)
+ remove_cr = [python, '-c', 'import sys;[sys.stdout.write(line.replace(chr(13), "")) for line in sys.stdin]']
qapi_doc_out_nocr = custom_target('QAPI rST doc newline-sanitized',
output: ['doc-good.txt.nocr'],
input: qapi_doc_out[0],
build_by_default: true,
- command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'],
+ command: [remove_cr, '@INPUT@'],
capture: true)
qapi_doc_ref_nocr = custom_target('QAPI rST doc reference newline-sanitized',
output: ['doc-good.ref.nocr'],
input: files('doc-good.txt'),
build_by_default: true,
- command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'],
+ command: [remove_cr, '@INPUT@'],
capture: true)
test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_out_nocr[0]],
--
2.39.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 5/8] docs: drop texinfo options
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (3 preceding siblings ...)
2023-01-10 8:02 ` [PATCH v3 4/8] meson: replace Perl usage with Python marcandre.lureau
@ 2023-01-10 8:02 ` marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 6/8] Update lcitool and fedora to 37 marcandre.lureau
` (3 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
It looks like this is no longer wanted, we only build the html output.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
docs/conf.py | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index e33cf3d381..73a287a4f2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -297,19 +297,6 @@
]
man_make_section_directory = False
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-# dir menu entry, description, category)
-texinfo_documents = [
- (master_doc, 'QEMU', u'QEMU Documentation',
- author, 'QEMU', 'One line description of project.',
- 'Miscellaneous'),
-]
-
-
-
# We use paths starting from qemu_docdir here so that you can run
# sphinx-build from anywhere and the kerneldoc extension can still
# find everything.
--
2.39.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 6/8] Update lcitool and fedora to 37
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (4 preceding siblings ...)
2023-01-10 8:02 ` [PATCH v3 5/8] docs: drop texinfo options marcandre.lureau
@ 2023-01-10 8:02 ` marcandre.lureau
2023-01-10 8:09 ` Thomas Huth
2023-01-10 8:02 ` [PATCH v3 7/8] lcitool: drop perl from QEMU project/dependencies marcandre.lureau
` (2 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Fedora 35 is EOL, upstream lcitool replaced it with 37.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/docker/dockerfiles/fedora-win32-cross.docker | 4 ++--
tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++--
tests/docker/dockerfiles/fedora.docker | 4 ++--
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/refresh | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index 75383ba185..cc5d1ac4be 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu
+# $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 98c03dc13b..cabbf4edfc 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu
+# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index d200c7fc10..f44b005000 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all fedora-35 qemu
+# $ lcitool dockerfile --layers all fedora-37 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index e3eb28cf2e..319a534c22 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5
+Subproject commit 319a534c220f53fc8670254cac25d6f662c82112
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index fa966e4009..a5ea0efc3b 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -111,7 +111,7 @@ try:
generate_dockerfile("centos8", "centos-stream-8")
generate_dockerfile("debian-amd64", "debian-11",
trailer="".join(debian11_extras))
- generate_dockerfile("fedora", "fedora-35")
+ generate_dockerfile("fedora", "fedora-37")
generate_dockerfile("opensuse-leap", "opensuse-leap-153")
generate_dockerfile("ubuntu2004", "ubuntu-2004",
trailer="".join(ubuntu2004_tsanhack))
@@ -161,12 +161,12 @@ try:
trailer=cross_build("s390x-linux-gnu-",
"s390x-softmmu,s390x-linux-user"))
- generate_dockerfile("fedora-win32-cross", "fedora-35",
+ generate_dockerfile("fedora-win32-cross", "fedora-37",
cross="mingw32",
trailer=cross_build("i686-w64-mingw32-",
"i386-softmmu"))
- generate_dockerfile("fedora-win64-cross", "fedora-35",
+ generate_dockerfile("fedora-win64-cross", "fedora-37",
cross="mingw64",
trailer=cross_build("x86_64-w64-mingw32-",
"x86_64-softmmu"))
--
2.39.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 7/8] lcitool: drop perl from QEMU project/dependencies
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (5 preceding siblings ...)
2023-01-10 8:02 ` [PATCH v3 6/8] Update lcitool and fedora to 37 marcandre.lureau
@ 2023-01-10 8:02 ` marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 8/8] lcitool: drop texinfo " marcandre.lureau
2023-01-10 10:41 ` [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps Alex Bennée
8 siblings, 0 replies; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
.gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
.gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
.gitlab-ci.d/cirrus/macos-12.vars | 2 +-
scripts/ci/setup/build-environment.yml | 1 -
tests/docker/dockerfiles/alpine.docker | 1 -
tests/docker/dockerfiles/centos8.docker | 1 -
tests/docker/dockerfiles/debian-amd64-cross.docker | 1 -
tests/docker/dockerfiles/debian-amd64.docker | 1 -
tests/docker/dockerfiles/debian-arm64-cross.docker | 1 -
tests/docker/dockerfiles/debian-armel-cross.docker | 1 -
tests/docker/dockerfiles/debian-armhf-cross.docker | 1 -
tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 -
tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 -
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 -
tests/docker/dockerfiles/debian-s390x-cross.docker | 1 -
tests/docker/dockerfiles/debian-tricore-cross.docker | 1 -
tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
tests/docker/dockerfiles/fedora.docker | 1 -
tests/docker/dockerfiles/opensuse-leap.docker | 1 -
tests/docker/dockerfiles/ubuntu2004.docker | 1 -
tests/lcitool/projects/qemu.yml | 1 -
tests/vm/centos.aarch64 | 2 +-
23 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars
index e3fc3235b9..f32f01a954 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 bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio 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 9f56babd9c..813c051616 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 bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-12.vars
index ef9e14b373..33bb4e1040 100644
--- a/.gitlab-ci.d/cirrus/macos-12.vars
+++ b/.gitlab-ci.d/cirrus/macos-12.vars
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3'
-PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c 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'
+PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja 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'
PYTHON='/opt/homebrew/bin/python3'
diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index b04c2b7cee..58438008ee 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -155,7 +155,6 @@
- nettle-devel
- ninja-build
- nmap-ncat
- - perl-Test-Harness
- pixman-devel
- python36
- rdma-core-devel
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 094f66f4eb..3293c790c9 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -77,7 +77,6 @@ RUN apk update && \
numactl-dev \
openssh-client \
pcre-dev \
- perl \
pixman-dev \
pkgconf \
pulseaudio-dev \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 1f70d41aeb..f13745e6cc 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -91,7 +91,6 @@ RUN dnf distro-sync -y && \
openssh-clients \
pam-devel \
pcre-static \
- perl \
pixman-devel \
pkgconfig \
pulseaudio-libs-devel \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 5e57309361..d0ace6d0f7 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ncat \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index bfeab01ee3..0517c4c315 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -108,7 +108,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
nettle-dev \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 98885bd0ee..9ac1c1ba3f 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ncat \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index d5c08714e4..8be492f4ad 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ncat \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 471444fcf4..da789e04af 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ncat \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 15b0224b76..8b7c59c4f9 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ncat \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index a5d3ca6e2f..f9f1ed5fd2 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ncat \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index d2954e61f6..e423d88c2d 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ncat \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index d43ce16317..c1134f4cec 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ncat \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
index b573b9ded2..34b2cea4e3 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -28,7 +28,6 @@ RUN apt update && \
locales \
make \
ninja-build \
- perl-base \
pkgconf \
python3-pip \
python3-setuptools \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index cc5d1ac4be..de811b332b 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -42,7 +42,6 @@ exec "$@"' > /usr/bin/nosync && \
nmap-ncat \
openssh-clients \
pcre-static \
- perl-base \
python3 \
python3-PyYAML \
python3-numpy \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index cabbf4edfc..71681d6f92 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -42,7 +42,6 @@ exec "$@"' > /usr/bin/nosync && \
nmap-ncat \
openssh-clients \
pcre-static \
- perl-base \
python3 \
python3-PyYAML \
python3-numpy \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index f44b005000..ca3793b04b 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -98,7 +98,6 @@ exec "$@"' > /usr/bin/nosync && \
openssh-clients \
pam-devel \
pcre-static \
- perl-base \
pixman-devel \
pkgconfig \
pulseaudio-libs-devel \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 4361b01464..680f49e7dc 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -88,7 +88,6 @@ RUN zypper update -y && \
openssh \
pam-devel \
pcre-devel-static \
- perl-base \
pkgconfig \
python3-Pillow \
python3-PyYAML \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 9417bca2fa..6594bba338 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -105,7 +105,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
nettle-dev \
ninja-build \
openssh-client \
- perl-base \
pkgconf \
python3 \
python3-numpy \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index c62dbc00f9..c2af92348a 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -83,7 +83,6 @@ packages:
- ncursesw
- pam
- pcre-static
- - perl
- pixman
- pkg-config
- pulseaudio
diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64
index 2de7ef6992..3f58de1e64 100755
--- a/tests/vm/centos.aarch64
+++ b/tests/vm/centos.aarch64
@@ -28,7 +28,7 @@ DEFAULT_CONFIG = {
"dnf config-manager --set-enabled powertools, "
"dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo, "
"dnf install -y make ninja-build git python38 gcc gcc-c++ flex bison "\
- "glib2-devel perl pixman-devel zlib-devel docker-ce.aarch64, "
+ "glib2-devel pixman-devel zlib-devel docker-ce.aarch64, "
"systemctl enable docker, "
),
# We increase beyond the default time since during boot
--
2.39.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 8/8] lcitool: drop texinfo from QEMU project/dependencies
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (6 preceding siblings ...)
2023-01-10 8:02 ` [PATCH v3 7/8] lcitool: drop perl from QEMU project/dependencies marcandre.lureau
@ 2023-01-10 8:02 ` marcandre.lureau
2023-01-10 10:41 ` [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps Alex Bennée
8 siblings, 0 replies; 17+ messages in thread
From: marcandre.lureau @ 2023-01-10 8:02 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Marc-André Lureau,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
.gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
.gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
.gitlab-ci.d/cirrus/macos-12.vars | 2 +-
tests/docker/dockerfiles/alpine.docker | 1 -
tests/docker/dockerfiles/centos8.docker | 1 -
tests/docker/dockerfiles/debian-amd64-cross.docker | 3 +--
tests/docker/dockerfiles/debian-amd64.docker | 1 -
tests/docker/dockerfiles/debian-arm64-cross.docker | 3 +--
tests/docker/dockerfiles/debian-armel-cross.docker | 3 +--
tests/docker/dockerfiles/debian-armhf-cross.docker | 3 +--
tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 +--
tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 +--
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 +--
tests/docker/dockerfiles/debian-s390x-cross.docker | 3 +--
tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
tests/docker/dockerfiles/fedora.docker | 1 -
tests/docker/dockerfiles/opensuse-leap.docker | 1 -
tests/docker/dockerfiles/ubuntu2004.docker | 1 -
tests/lcitool/projects/qemu.yml | 1 -
20 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars
index f32f01a954..8934e5d57f 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 bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract 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 813c051616..65ce456c48 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 bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-12.vars
index 33bb4e1040..65b78fa08f 100644
--- a/.gitlab-ci.d/cirrus/macos-12.vars
+++ b/.gitlab-ci.d/cirrus/macos-12.vars
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3'
-PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
+PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract usbredir vde vte3 zlib zstd'
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme'
PYTHON='/opt/homebrew/bin/python3'
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 3293c790c9..4a569d82f6 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -99,7 +99,6 @@ RUN apk update && \
spice-protocol \
tar \
tesseract-ocr \
- texinfo \
usbredir-dev \
util-linux \
vde2-dev \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index f13745e6cc..fbc953c6dc 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -110,7 +110,6 @@ RUN dnf distro-sync -y && \
systemd-devel \
systemtap-sdt-devel \
tar \
- texinfo \
usbredir-devel \
util-linux \
virglrenderer-devel \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index d0ace6d0f7..5175095a85 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng \
- texinfo && \
+ tesseract-ocr-eng && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index 0517c4c315..b61f664ea2 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -125,7 +125,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
- texinfo \
xfslibs-dev \
zlib1g-dev && \
eatmydata apt-get autoremove -y && \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 9ac1c1ba3f..b69958c69f 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng \
- texinfo && \
+ tesseract-ocr-eng && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index 8be492f4ad..96b524fab6 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng \
- texinfo && \
+ tesseract-ocr-eng && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index da789e04af..08a75cebdb 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng \
- texinfo && \
+ tesseract-ocr-eng && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 8b7c59c4f9..5930e6fa5d 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng \
- texinfo && \
+ tesseract-ocr-eng && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index f9f1ed5fd2..c65d9830e7 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng \
- texinfo && \
+ tesseract-ocr-eng && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index e423d88c2d..2ae56c978e 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng \
- texinfo && \
+ tesseract-ocr-eng && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index c1134f4cec..0db86a0fcd 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \
tar \
tesseract-ocr \
- tesseract-ocr-eng \
- texinfo && \
+ tesseract-ocr-eng && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index de811b332b..b659c0b8a8 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \
tar \
tesseract \
tesseract-langpack-eng \
- texinfo \
util-linux \
which && \
nosync dnf autoremove -y && \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 71681d6f92..0a404c15bf 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \
tar \
tesseract \
tesseract-langpack-eng \
- texinfo \
util-linux \
which && \
nosync dnf autoremove -y && \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index ca3793b04b..5d60a96141 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -121,7 +121,6 @@ exec "$@"' > /usr/bin/nosync && \
tar \
tesseract \
tesseract-langpack-eng \
- texinfo \
usbredir-devel \
util-linux \
virglrenderer-devel \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 680f49e7dc..4b2c02d6ab 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -111,7 +111,6 @@ RUN zypper update -y && \
tar \
tesseract-ocr \
tesseract-ocr-traineddata-english \
- texinfo \
usbredir-devel \
util-linux \
virglrenderer-devel \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 6594bba338..13ab0b6887 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -124,7 +124,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
- texinfo \
xfslibs-dev \
zlib1g-dev && \
eatmydata apt-get autoremove -y && \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index c2af92348a..6467bcf08a 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -109,7 +109,6 @@ packages:
- tar
- tesseract
- tesseract-eng
- - texinfo
- usbredir
- virglrenderer
- vte
--
2.39.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v3 6/8] Update lcitool and fedora to 37
2023-01-10 8:02 ` [PATCH v3 6/8] Update lcitool and fedora to 37 marcandre.lureau
@ 2023-01-10 8:09 ` Thomas Huth
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2023-01-10 8:09 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Markus Armbruster,
qemu-s390x, David Hildenbrand, Richard Henderson, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
On 10/01/2023 09.02, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Fedora 35 is EOL, upstream lcitool replaced it with 37.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
...
> diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
> index e3eb28cf2e..319a534c22 160000
> --- a/tests/lcitool/libvirt-ci
> +++ b/tests/lcitool/libvirt-ci
> @@ -1 +1 @@
> -Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5
> +Subproject commit 319a534c220f53fc8670254cac25d6f662c82112
In case you respin this patch, please add a note to the commit description
explaining why you update the submodule here (I assume it's necessary to
pull in some changes for F37 support?).
Apart from that:
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/8] build-sys: fix crlf-ending C code
2023-01-10 8:02 ` [PATCH v3 1/8] build-sys: fix crlf-ending C code marcandre.lureau
@ 2023-01-10 8:33 ` Thomas Huth
2023-01-10 9:53 ` Marc-André Lureau
0 siblings, 1 reply; 17+ messages in thread
From: Thomas Huth @ 2023-01-10 8:33 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel, pbonzini
Cc: Eric Farman, Halil Pasic, Markus Armbruster, qemu-s390x,
David Hildenbrand, Richard Henderson, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
On 10/01/2023 09.02, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> On msys2, the shader-to-C script produces bad C:
> ./ui/shader/texture-blit-vert.h:2:5: error: missing terminating " character [-Werror]
>
> Fix it by changing the line ending from crlf to lf, and convert the
> script to Python (qemu build seems perl-free after that).
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Acked-by: Thomas Huth <thuth@redhat.com>
> ---
> meson.build | 2 +-
> scripts/shaderinclude.pl | 16 ----------------
> scripts/shaderinclude.py | 26 ++++++++++++++++++++++++++
> 3 files changed, 27 insertions(+), 17 deletions(-)
> delete mode 100644 scripts/shaderinclude.pl
> create mode 100755 scripts/shaderinclude.py
This seems to break our "make vm-build-freebsd" test... I'm now getting:
[281/1485] Generating ui/shader/texture-blit-frag.h with a custom command
(wrapped by meson to capture output)
FAILED: ui/shader/texture-blit-frag.h
/usr/local/bin/python3.7 /usr/home/qemu/qemu-test.SnknY0/src/meson/meson.py
--internal exe --capture ui/shader/texture-blit-frag.h --
/usr/home/qemu/qemu-test.SnknY0/src/scripts/shaderinclude.py
../src/ui/shader/texture-blit.frag
--- stderr ---
env: python3: No such file or directory
Looks like you've got to do "chmod a-x scripts/shaderinclude.py" to get this
fixed, after removing the executable bits, I'm getting:
[281/1485] Generating ui/shader/texture-blit-frag.h with a custom command
(wrapped by meson to capture output)
and the compilation process continues happily.
Thomas
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 3/8] configure: replace Perl usage with sed
2023-01-10 8:02 ` [PATCH v3 3/8] configure: replace Perl usage with sed marcandre.lureau
@ 2023-01-10 8:50 ` Thomas Huth
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2023-01-10 8:50 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
Cc: Eric Farman, Halil Pasic, pbonzini, Markus Armbruster,
qemu-s390x, David Hildenbrand, Richard Henderson, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
On 10/01/2023 09.02, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Let's try to reduce our Perl usage during config/build-time.
>
> Note: this patch might be dropped if "configure: remove
> backwards-compatibility code" is merged earlier.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> configure | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/configure b/configure
> index 2281892657..9a944698b4 100755
> --- a/configure
> +++ b/configure
> @@ -2571,11 +2571,9 @@ else
> if test -f meson-private/cmd_line.txt; then
> # Adjust old command line options whose type was changed
> # Avoids having to use "setup --wipe" when Meson is upgraded
> - perl -i -ne '
> - s/^gettext = true$/gettext = auto/;
> - s/^gettext = false$/gettext = disabled/;
> - /^b_staticpic/ && next;
> - print;' meson-private/cmd_line.txt
> + sed -i.bak -e 's/^gettext = true$/gettext = auto/g' \
> + -e 's/^gettext = false$/gettext = disabled/g' \
> + -e '/^b_staticpic/d' meson-private/cmd_line.txt
> fi
> fi
I've ran "make vm-build-freebsd" and "make vm-build-openbsd" with this patch
and it worked fine, I didn't spot anything in the console output, thus:
Tested-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 1/8] build-sys: fix crlf-ending C code
2023-01-10 8:33 ` Thomas Huth
@ 2023-01-10 9:53 ` Marc-André Lureau
0 siblings, 0 replies; 17+ messages in thread
From: Marc-André Lureau @ 2023-01-10 9:53 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, pbonzini, Eric Farman, Halil Pasic,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Beraldo Leal, Christian Borntraeger,
Daniel P. Berrangé,
Alex Bennée, Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
[-- Attachment #1: Type: text/plain, Size: 2190 bytes --]
Hi
On Tue, Jan 10, 2023 at 12:33 PM Thomas Huth <thuth@redhat.com> wrote:
> On 10/01/2023 09.02, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > On msys2, the shader-to-C script produces bad C:
> > ./ui/shader/texture-blit-vert.h:2:5: error: missing terminating "
> character [-Werror]
> >
> > Fix it by changing the line ending from crlf to lf, and convert the
> > script to Python (qemu build seems perl-free after that).
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Acked-by: Thomas Huth <thuth@redhat.com>
> > ---
> > meson.build | 2 +-
> > scripts/shaderinclude.pl | 16 ----------------
> > scripts/shaderinclude.py | 26 ++++++++++++++++++++++++++
> > 3 files changed, 27 insertions(+), 17 deletions(-)
> > delete mode 100644 scripts/shaderinclude.pl
> > create mode 100755 scripts/shaderinclude.py
>
> This seems to break our "make vm-build-freebsd" test... I'm now getting:
>
> [281/1485] Generating ui/shader/texture-blit-frag.h with a custom command
> (wrapped by meson to capture output)
> FAILED: ui/shader/texture-blit-frag.h
> /usr/local/bin/python3.7
> /usr/home/qemu/qemu-test.SnknY0/src/meson/meson.py
> --internal exe --capture ui/shader/texture-blit-frag.h --
> /usr/home/qemu/qemu-test.SnknY0/src/scripts/shaderinclude.py
> ../src/ui/shader/texture-blit.frag
> --- stderr ---
> env: python3: No such file or directory
>
> Looks like you've got to do "chmod a-x scripts/shaderinclude.py" to get
> this
> fixed, after removing the executable bits, I'm getting:
>
> [281/1485] Generating ui/shader/texture-blit-frag.h with a custom command
> (wrapped by meson to capture output)
>
> and the compilation process continues happily.
>
thanks for the tip, indeed since 0.51 "find_program: use Meson's Python3
for non-executable Python scripts":
https://github.com/mesonbuild/meson/commit/0078d808a2a2b01c634483ca4a986f52ffe1ce3c
It's a bit annoying to have a mix of executable and non-executable
scripts/*.py, but python.., oh well.. I suppose the ones used during build
are -x, the one used manually are +x.
[-- Attachment #2: Type: text/html, Size: 3303 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (7 preceding siblings ...)
2023-01-10 8:02 ` [PATCH v3 8/8] lcitool: drop texinfo " marcandre.lureau
@ 2023-01-10 10:41 ` Alex Bennée
2023-01-10 10:44 ` Marc-André Lureau
2023-01-10 10:45 ` Thomas Huth
8 siblings, 2 replies; 17+ messages in thread
From: Alex Bennée @ 2023-01-10 10:41 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, Eric Farman, Halil Pasic, pbonzini,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Hi,
>
> Fix the shader compilation error on win32/msys2 and convert the related script
> from perl to python. Drop unneeded dependencies from lcitool project.
Queued to testing/next, thanks.
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps
2023-01-10 10:41 ` [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps Alex Bennée
@ 2023-01-10 10:44 ` Marc-André Lureau
2023-01-10 12:58 ` Alex Bennée
2023-01-10 10:45 ` Thomas Huth
1 sibling, 1 reply; 17+ messages in thread
From: Marc-André Lureau @ 2023-01-10 10:44 UTC (permalink / raw)
To: Alex Bennée
Cc: qemu-devel, Eric Farman, Halil Pasic, pbonzini,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi
On Tue, Jan 10, 2023 at 2:41 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> marcandre.lureau@redhat.com writes:
>
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Hi,
> >
> > Fix the shader compilation error on win32/msys2 and convert the related
> script
> > from perl to python. Drop unneeded dependencies from lcitool project.
>
> Queued to testing/next, thanks.
>
Thanks but wait for v4, Thomas pointed out some issues with the python
scripts +x.
[-- Attachment #2: Type: text/html, Size: 1051 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps
2023-01-10 10:41 ` [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps Alex Bennée
2023-01-10 10:44 ` Marc-André Lureau
@ 2023-01-10 10:45 ` Thomas Huth
1 sibling, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2023-01-10 10:45 UTC (permalink / raw)
To: Alex Bennée, marcandre.lureau
Cc: qemu-devel, Eric Farman, Halil Pasic, pbonzini,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Beraldo Leal, Christian Borntraeger,
Daniel P. Berrangé,
Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
On 10/01/2023 11.41, Alex Bennée wrote:
>
> marcandre.lureau@redhat.com writes:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Hi,
>>
>> Fix the shader compilation error on win32/msys2 and convert the related script
>> from perl to python. Drop unneeded dependencies from lcitool project.
>
> Queued to testing/next, thanks.
Please make sure to fix the permissions (a-x) of the new script in the first
patch.
Thanks,
Thomas
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps
2023-01-10 10:44 ` Marc-André Lureau
@ 2023-01-10 12:58 ` Alex Bennée
0 siblings, 0 replies; 17+ messages in thread
From: Alex Bennée @ 2023-01-10 12:58 UTC (permalink / raw)
To: Marc-André Lureau
Cc: qemu-devel, Eric Farman, Halil Pasic, pbonzini,
Markus Armbruster, qemu-s390x, David Hildenbrand,
Richard Henderson, Thomas Huth, Beraldo Leal,
Christian Borntraeger, Daniel P. Berrangé,
Cleber Rosa, Peter Maydell, Ed Maste, kraxel,
Philippe Mathieu-Daudé,
Michael Roth, Li-Wen Hsu, John Snow, Wainer dos Santos Moschetta,
Cornelia Huck
Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> Hi
>
> On Tue, Jan 10, 2023 at 2:41 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> marcandre.lureau@redhat.com writes:
>
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Hi,
> >
> > Fix the shader compilation error on win32/msys2 and convert the related script
> > from perl to python. Drop unneeded dependencies from lcitool project.
>
> Queued to testing/next, thanks.
>
> Thanks but wait for v4, Thomas pointed out some issues with the python
> scripts +x.
Ok, if you post them today I can include them in my omnibus maintainer
tree series which I'm building at the moment.
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2023-01-10 13:31 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-10 8:02 [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 1/8] build-sys: fix crlf-ending C code marcandre.lureau
2023-01-10 8:33 ` Thomas Huth
2023-01-10 9:53 ` Marc-André Lureau
2023-01-10 8:02 ` [PATCH v3 2/8] .gitlab-ci.d/windows: do not disable opengl marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 3/8] configure: replace Perl usage with sed marcandre.lureau
2023-01-10 8:50 ` Thomas Huth
2023-01-10 8:02 ` [PATCH v3 4/8] meson: replace Perl usage with Python marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 5/8] docs: drop texinfo options marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 6/8] Update lcitool and fedora to 37 marcandre.lureau
2023-01-10 8:09 ` Thomas Huth
2023-01-10 8:02 ` [PATCH v3 7/8] lcitool: drop perl from QEMU project/dependencies marcandre.lureau
2023-01-10 8:02 ` [PATCH v3 8/8] lcitool: drop texinfo " marcandre.lureau
2023-01-10 10:41 ` [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps Alex Bennée
2023-01-10 10:44 ` Marc-André Lureau
2023-01-10 12:58 ` Alex Bennée
2023-01-10 10:45 ` Thomas Huth
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.