* [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps
@ 2023-01-10 13:26 marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 1/8] build-sys: fix crlf-ending C code marcandre.lureau
` (8 more replies)
0 siblings, 9 replies; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:26 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
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.
v4:
- remove -x from python script, to fix the build on FreeBSD
- add more commoent on lcitool update patch
- add some rb/tb tags
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-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
--
2.39.0
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v4 1/8] build-sys: fix crlf-ending C code
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
@ 2023-01-10 13:26 ` marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 2/8] .gitlab-ci.d/windows: do not disable opengl marcandre.lureau
` (7 subsequent siblings)
8 siblings, 0 replies; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:26 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
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 100644 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 100644
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] 21+ messages in thread
* [PATCH v4 2/8] .gitlab-ci.d/windows: do not disable opengl
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 1/8] build-sys: fix crlf-ending C code marcandre.lureau
@ 2023-01-10 13:26 ` marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 3/8] configure: replace Perl usage with sed marcandre.lureau
` (6 subsequent siblings)
8 siblings, 0 replies; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:26 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
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] 21+ messages in thread
* [PATCH v4 3/8] configure: replace Perl usage with sed
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 1/8] build-sys: fix crlf-ending C code marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 2/8] .gitlab-ci.d/windows: do not disable opengl marcandre.lureau
@ 2023-01-10 13:26 ` marcandre.lureau
2023-01-10 13:35 ` Daniel P. Berrangé
2023-01-10 13:26 ` [PATCH v4 4/8] meson: replace Perl usage with Python marcandre.lureau
` (5 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:26 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
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>
Tested-by: Thomas Huth <thuth@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] 21+ messages in thread
* [PATCH v4 4/8] meson: replace Perl usage with Python
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (2 preceding siblings ...)
2023-01-10 13:26 ` [PATCH v4 3/8] configure: replace Perl usage with sed marcandre.lureau
@ 2023-01-10 13:26 ` marcandre.lureau
2023-01-10 13:33 ` Daniel P. Berrangé
2023-01-10 13:26 ` [PATCH v4 5/8] docs: drop texinfo options marcandre.lureau
` (4 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:26 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
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] 21+ messages in thread
* [PATCH v4 5/8] docs: drop texinfo options
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (3 preceding siblings ...)
2023-01-10 13:26 ` [PATCH v4 4/8] meson: replace Perl usage with Python marcandre.lureau
@ 2023-01-10 13:26 ` marcandre.lureau
2023-01-10 13:35 ` Daniel P. Berrangé
2023-01-10 13:26 ` [PATCH v4 6/8] Update lcitool and fedora to 37 marcandre.lureau
` (3 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:26 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
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] 21+ messages in thread
* [PATCH v4 6/8] Update lcitool and fedora to 37
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (4 preceding siblings ...)
2023-01-10 13:26 ` [PATCH v4 5/8] docs: drop texinfo options marcandre.lureau
@ 2023-01-10 13:26 ` marcandre.lureau
2023-01-19 12:29 ` Alex Bennée
2023-01-10 13:26 ` [PATCH v4 7/8] lcitool: drop perl from QEMU project/dependencies marcandre.lureau
` (2 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:26 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Fedora 35 is EOL.
Update to upstream lcitool, that dropped f35 and added f37.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@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] 21+ messages in thread
* [PATCH v4 7/8] lcitool: drop perl from QEMU project/dependencies
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (5 preceding siblings ...)
2023-01-10 13:26 ` [PATCH v4 6/8] Update lcitool and fedora to 37 marcandre.lureau
@ 2023-01-10 13:26 ` marcandre.lureau
2023-01-10 13:36 ` Daniel P. Berrangé
2023-01-10 13:27 ` [PATCH v4 8/8] lcitool: drop texinfo " marcandre.lureau
2023-01-10 16:35 ` [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps Alex Bennée
8 siblings, 1 reply; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:26 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
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] 21+ messages in thread
* [PATCH v4 8/8] lcitool: drop texinfo from QEMU project/dependencies
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (6 preceding siblings ...)
2023-01-10 13:26 ` [PATCH v4 7/8] lcitool: drop perl from QEMU project/dependencies marcandre.lureau
@ 2023-01-10 13:27 ` marcandre.lureau
2023-01-10 13:37 ` Daniel P. Berrangé
2023-01-16 10:06 ` Alex Bennée
2023-01-10 16:35 ` [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps Alex Bennée
8 siblings, 2 replies; 21+ messages in thread
From: marcandre.lureau @ 2023-01-10 13:27 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Marc-André Lureau, Markus Armbruster,
Richard Henderson, Cleber Rosa, thuth, Halil Pasic, Michael Roth,
Li-Wen Hsu, qemu-s390x, Christian Borntraeger, Ed Maste
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/debian-toolchain.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 -
21 files changed, 11 insertions(+), 29 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/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker
index d3d4d3344e..6c73408b34 100644
--- a/tests/docker/dockerfiles/debian-toolchain.docker
+++ b/tests/docker/dockerfiles/debian-toolchain.docker
@@ -21,7 +21,6 @@ RUN apt update && \
libmpc-dev \
libmpfr-dev \
rsync \
- texinfo \
wget && \
DEBIAN_FRONTEND=noninteractive eatmydata \
apt build-dep -yy --arch-only gcc glibc
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] 21+ messages in thread
* Re: [PATCH v4 4/8] meson: replace Perl usage with Python
2023-01-10 13:26 ` [PATCH v4 4/8] meson: replace Perl usage with Python marcandre.lureau
@ 2023-01-10 13:33 ` Daniel P. Berrangé
0 siblings, 0 replies; 21+ messages in thread
From: Daniel P. Berrangé @ 2023-01-10 13:33 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, John Snow, kraxel, Beraldo Leal,
Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Markus Armbruster, Richard Henderson, Cleber Rosa,
thuth, Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
On Tue, Jan 10, 2023 at 05:26:56PM +0400, marcandre.lureau@redhat.com wrote:
> 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(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 3/8] configure: replace Perl usage with sed
2023-01-10 13:26 ` [PATCH v4 3/8] configure: replace Perl usage with sed marcandre.lureau
@ 2023-01-10 13:35 ` Daniel P. Berrangé
0 siblings, 0 replies; 21+ messages in thread
From: Daniel P. Berrangé @ 2023-01-10 13:35 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, John Snow, kraxel, Beraldo Leal,
Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Markus Armbruster, Richard Henderson, Cleber Rosa,
thuth, Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
On Tue, Jan 10, 2023 at 05:26:55PM +0400, 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>
> Tested-by: Thomas Huth <thuth@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
Do we really need to have a '.bak' file created ? The original
perl cmd didn't
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 5/8] docs: drop texinfo options
2023-01-10 13:26 ` [PATCH v4 5/8] docs: drop texinfo options marcandre.lureau
@ 2023-01-10 13:35 ` Daniel P. Berrangé
0 siblings, 0 replies; 21+ messages in thread
From: Daniel P. Berrangé @ 2023-01-10 13:35 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, John Snow, kraxel, Beraldo Leal,
Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Markus Armbruster, Richard Henderson, Cleber Rosa,
thuth, Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
On Tue, Jan 10, 2023 at 05:26:57PM +0400, marcandre.lureau@redhat.com wrote:
> 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(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 7/8] lcitool: drop perl from QEMU project/dependencies
2023-01-10 13:26 ` [PATCH v4 7/8] lcitool: drop perl from QEMU project/dependencies marcandre.lureau
@ 2023-01-10 13:36 ` Daniel P. Berrangé
0 siblings, 0 replies; 21+ messages in thread
From: Daniel P. Berrangé @ 2023-01-10 13:36 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, John Snow, kraxel, Beraldo Leal,
Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Markus Armbruster, Richard Henderson, Cleber Rosa,
thuth, Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
On Tue, Jan 10, 2023 at 05:26:59PM +0400, marcandre.lureau@redhat.com wrote:
> 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(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 8/8] lcitool: drop texinfo from QEMU project/dependencies
2023-01-10 13:27 ` [PATCH v4 8/8] lcitool: drop texinfo " marcandre.lureau
@ 2023-01-10 13:37 ` Daniel P. Berrangé
2023-01-16 10:06 ` Alex Bennée
1 sibling, 0 replies; 21+ messages in thread
From: Daniel P. Berrangé @ 2023-01-10 13:37 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, John Snow, kraxel, Beraldo Leal,
Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Alex Bennée,
Peter Maydell, Markus Armbruster, Richard Henderson, Cleber Rosa,
thuth, Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
On Tue, Jan 10, 2023 at 05:27:00PM +0400, marcandre.lureau@redhat.com wrote:
> 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/debian-toolchain.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 -
> 21 files changed, 11 insertions(+), 29 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
` (7 preceding siblings ...)
2023-01-10 13:27 ` [PATCH v4 8/8] lcitool: drop texinfo " marcandre.lureau
@ 2023-01-10 16:35 ` Alex Bennée
8 siblings, 0 replies; 21+ messages in thread
From: Alex Bennée @ 2023-01-10 16:35 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Peter Maydell,
Markus Armbruster, Richard Henderson, Cleber Rosa, thuth,
Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
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.
>
> v4:
> - remove -x from python script, to fix the build on FreeBSD
> - add more commoent on lcitool update patch
> - add some rb/tb tags
Queued to testing/next, 2nd times a charm ;-)
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 8/8] lcitool: drop texinfo from QEMU project/dependencies
2023-01-10 13:27 ` [PATCH v4 8/8] lcitool: drop texinfo " marcandre.lureau
2023-01-10 13:37 ` Daniel P. Berrangé
@ 2023-01-16 10:06 ` Alex Bennée
2023-01-16 10:21 ` Marc-André Lureau
2023-01-16 10:46 ` Daniel P. Berrangé
1 sibling, 2 replies; 21+ messages in thread
From: Alex Bennée @ 2023-01-16 10:06 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Peter Maydell,
Markus Armbruster, Richard Henderson, Cleber Rosa, thuth,
Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
I'm not sure how but this is re-breaking the windows build you just fixed:
In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl.h:46,
from /tmp/qemu-test/src/include/ui/egl-helpers.h:5,
from /tmp/qemu-test/src/include/ui/gtk.h:25,
from ../src/ui/gtk.c:42:
/usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl_generated.h:11:10: fatal error: EGL/eglplatform.h: No such file or directory
11 | #include "EGL/eglplatform.h"
| ^~~~~~~~~~~~~~~~~~~
compilation terminated.
I'm going to drop this patch for now.
> ---
> .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/debian-toolchain.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 -
> 21 files changed, 11 insertions(+), 29 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/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker
> index d3d4d3344e..6c73408b34 100644
> --- a/tests/docker/dockerfiles/debian-toolchain.docker
> +++ b/tests/docker/dockerfiles/debian-toolchain.docker
> @@ -21,7 +21,6 @@ RUN apt update && \
> libmpc-dev \
> libmpfr-dev \
> rsync \
> - texinfo \
> wget && \
> DEBIAN_FRONTEND=noninteractive eatmydata \
> apt build-dep -yy --arch-only gcc glibc
> 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
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 8/8] lcitool: drop texinfo from QEMU project/dependencies
2023-01-16 10:06 ` Alex Bennée
@ 2023-01-16 10:21 ` Marc-André Lureau
2023-01-16 14:52 ` Alex Bennée
2023-01-16 10:46 ` Daniel P. Berrangé
1 sibling, 1 reply; 21+ messages in thread
From: Marc-André Lureau @ 2023-01-16 10:21 UTC (permalink / raw)
To: Alex Bennée
Cc: qemu-devel, Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Peter Maydell,
Markus Armbruster, Richard Henderson, Cleber Rosa, thuth,
Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
[-- Attachment #1: Type: text/plain, Size: 18873 bytes --]
Hi
On Mon, Jan 16, 2023 at 2:08 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> marcandre.lureau@redhat.com writes:
>
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> I'm not sure how but this is re-breaking the windows build you just fixed:
>
> In file included from
> /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl.h:46,
> from /tmp/qemu-test/src/include/ui/egl-helpers.h:5,
> from /tmp/qemu-test/src/include/ui/gtk.h:25,
> from ../src/ui/gtk.c:42:
>
> /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl_generated.h:11:10:
> fatal error: EGL/eglplatform.h: No such file or directory
> 11 | #include "EGL/eglplatform.h"
> | ^~~~~~~~~~~~~~~~~~~
> compilation terminated.
>
> I'm going to drop this patch for now.
>
Why is this patch related?
How did you get that error? It looks like your system mingw-epoxy is bad
(on Fedora, I have
/usr/x86_64-w64-mingw32/sys-root/mingw/include/EGL/eglplatform.h installed
by mingw64-angleproject-3280-6.git57ea533.fc37.noarch)
>
> > ---
> > .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/debian-toolchain.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 -
> > 21 files changed, 11 insertions(+), 29 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/debian-toolchain.docker
> b/tests/docker/dockerfiles/debian-toolchain.docker
> > index d3d4d3344e..6c73408b34 100644
> > --- a/tests/docker/dockerfiles/debian-toolchain.docker
> > +++ b/tests/docker/dockerfiles/debian-toolchain.docker
> > @@ -21,7 +21,6 @@ RUN apt update && \
> > libmpc-dev \
> > libmpfr-dev \
> > rsync \
> > - texinfo \
> > wget && \
> > DEBIAN_FRONTEND=noninteractive eatmydata \
> > apt build-dep -yy --arch-only gcc glibc
> > 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
>
>
> --
> Alex Bennée
> Virtualisation Tech Lead @ Linaro
>
>
[-- Attachment #2: Type: text/html, Size: 23067 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 8/8] lcitool: drop texinfo from QEMU project/dependencies
2023-01-16 10:06 ` Alex Bennée
2023-01-16 10:21 ` Marc-André Lureau
@ 2023-01-16 10:46 ` Daniel P. Berrangé
2023-01-16 12:09 ` Alex Bennée
1 sibling, 1 reply; 21+ messages in thread
From: Daniel P. Berrangé @ 2023-01-16 10:46 UTC (permalink / raw)
To: Alex Bennée
Cc: marcandre.lureau, qemu-devel, John Snow, kraxel, Beraldo Leal,
Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Peter Maydell,
Markus Armbruster, Richard Henderson, Cleber Rosa, thuth,
Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
On Mon, Jan 16, 2023 at 10:06:07AM +0000, Alex Bennée wrote:
>
> marcandre.lureau@redhat.com writes:
>
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> I'm not sure how but this is re-breaking the windows build you just fixed:
>
> In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl.h:46,
> from /tmp/qemu-test/src/include/ui/egl-helpers.h:5,
> from /tmp/qemu-test/src/include/ui/gtk.h:25,
> from ../src/ui/gtk.c:42:
> /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl_generated.h:11:10: fatal error: EGL/eglplatform.h: No such file or directory
> 11 | #include "EGL/eglplatform.h"
> | ^~~~~~~~~~~~~~~~~~~
> compilation terminated.
>
> I'm going to drop this patch for now.
We don't include mingw*-epoxy in the QEMU container, and AFAIK
nothing else we install has it as a dependency, so I'm guessing
you must have done a build locally rather than with our windows
containers ?
Ultimately this is a RPM packaging bug, which was recently fixed
in Fedora
commit 1e748f66e067d9332bc02f1ea994b6dd3b5e47f3 (HEAD -> f37, origin/rawhide, origin/main, origin/f37, origin/HEAD, rawhide)
Author: Kalev Lember <klember@redhat.com>
Date: Fri Jan 13 14:36:35 2023 +0100
Add missing runtime requires on mingw-angleproject
This fixes gtk cross compilation in upstream CI that started to fail
with:
/usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl_generated.h:11:10: fatal error: EGL/eglplatform.h: No such file or directory
So you should be able to just 'dnf update' to fix this.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 8/8] lcitool: drop texinfo from QEMU project/dependencies
2023-01-16 10:46 ` Daniel P. Berrangé
@ 2023-01-16 12:09 ` Alex Bennée
0 siblings, 0 replies; 21+ messages in thread
From: Alex Bennée @ 2023-01-16 12:09 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: marcandre.lureau, qemu-devel, John Snow, kraxel, Beraldo Leal,
Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Peter Maydell,
Markus Armbruster, Richard Henderson, Cleber Rosa, thuth,
Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
Daniel P. Berrangé <berrange@redhat.com> writes:
> On Mon, Jan 16, 2023 at 10:06:07AM +0000, Alex Bennée wrote:
>>
>> marcandre.lureau@redhat.com writes:
>>
>> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
>> >
>> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> I'm not sure how but this is re-breaking the windows build you just fixed:
>>
>> In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl.h:46,
>> from /tmp/qemu-test/src/include/ui/egl-helpers.h:5,
>> from /tmp/qemu-test/src/include/ui/gtk.h:25,
>> from ../src/ui/gtk.c:42:
>> /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl_generated.h:11:10: fatal error: EGL/eglplatform.h: No such file or directory
>> 11 | #include "EGL/eglplatform.h"
>> | ^~~~~~~~~~~~~~~~~~~
>> compilation terminated.
>>
>> I'm going to drop this patch for now.
>
> We don't include mingw*-epoxy in the QEMU container, and AFAIK
> nothing else we install has it as a dependency, so I'm guessing
> you must have done a build locally rather than with our windows
> containers ?
No I was building with the container but weirdly I am seeing different
results on different machines:
make docker-test-mingw@fedora-win64-cross J=9 V=1
works on my desktop
make docker-test-mingw@fedora-win64-cross V=1 J=20
fails on my build box. This must be some sort of weird caching behaviour
but I was trying to track down the failures in CI:
>
> Ultimately this is a RPM packaging bug, which was recently fixed
> in Fedora
>
> commit 1e748f66e067d9332bc02f1ea994b6dd3b5e47f3 (HEAD -> f37,
> origin/rawhide, origin/main, origin/f37, origin/HEAD, rawhide)
> Author: Kalev Lember <klember@redhat.com>
> Date: Fri Jan 13 14:36:35 2023 +0100
>
> Add missing runtime requires on mingw-angleproject
>
> This fixes gtk cross compilation in upstream CI that started to fail
> with:
>
> /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl_generated.h:11:10:
> fatal error: EGL/eglplatform.h: No such file or directory
>
>
> So you should be able to just 'dnf update' to fix this.
>
> With regards,
> Daniel
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 8/8] lcitool: drop texinfo from QEMU project/dependencies
2023-01-16 10:21 ` Marc-André Lureau
@ 2023-01-16 14:52 ` Alex Bennée
0 siblings, 0 replies; 21+ messages in thread
From: Alex Bennée @ 2023-01-16 14:52 UTC (permalink / raw)
To: Marc-André Lureau
Cc: qemu-devel, Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Peter Maydell,
Markus Armbruster, Richard Henderson, Cleber Rosa, thuth,
Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> Hi
>
> On Mon, Jan 16, 2023 at 2:08 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> marcandre.lureau@redhat.com writes:
>
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> I'm not sure how but this is re-breaking the windows build you just fixed:
>
> In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl.h:46,
> from /tmp/qemu-test/src/include/ui/egl-helpers.h:5,
> from /tmp/qemu-test/src/include/ui/gtk.h:25,
> from ../src/ui/gtk.c:42:
> /usr/x86_64-w64-mingw32/sys-root/mingw/include/epoxy/egl_generated.h:11:10: fatal error:
> EGL/eglplatform.h: No such file or directory
> 11 | #include "EGL/eglplatform.h"
> | ^~~~~~~~~~~~~~~~~~~
> compilation terminated.
>
> I'm going to drop this patch for now.
>
> Why is this patch related?
>
> How did you get that error? It looks like your system mingw-epoxy is bad (on Fedora, I have
> /usr/x86_64-w64-mingw32/sys-root/mingw/include/EGL/eglplatform.h installed by
> mingw64-angleproject-3280-6.git57ea533.fc37.noarch)
Something else is obviously throwing git bisect off its game. Clean
builds with NOCACHE=1 all work so I'll leave it in.
it in.
>
>
>
> > ---
> > .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/debian-toolchain.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 -
> > 21 files changed, 11 insertions(+), 29 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/debian-toolchain.docker
> b/tests/docker/dockerfiles/debian-toolchain.docker
> > index d3d4d3344e..6c73408b34 100644
> > --- a/tests/docker/dockerfiles/debian-toolchain.docker
> > +++ b/tests/docker/dockerfiles/debian-toolchain.docker
> > @@ -21,7 +21,6 @@ RUN apt update && \
> > libmpc-dev \
> > libmpfr-dev \
> > rsync \
> > - texinfo \
> > wget && \
> > DEBIAN_FRONTEND=noninteractive eatmydata \
> > apt build-dep -yy --arch-only gcc glibc
> > 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
>
> --
> Alex Bennée
> Virtualisation Tech Lead @ Linaro
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v4 6/8] Update lcitool and fedora to 37
2023-01-10 13:26 ` [PATCH v4 6/8] Update lcitool and fedora to 37 marcandre.lureau
@ 2023-01-19 12:29 ` Alex Bennée
0 siblings, 0 replies; 21+ messages in thread
From: Alex Bennée @ 2023-01-19 12:29 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, Daniel P. Berrangé,
John Snow, kraxel, Beraldo Leal, Philippe Mathieu-Daudé,
pbonzini, Eric Farman, David Hildenbrand,
Wainer dos Santos Moschetta, Cornelia Huck, Peter Maydell,
Markus Armbruster, Richard Henderson, Cleber Rosa, thuth,
Halil Pasic, Michael Roth, Li-Wen Hsu, qemu-s390x,
Christian Borntraeger, Ed Maste
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Fedora 35 is EOL.
>
> Update to upstream lcitool, that dropped f35 and added f37.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Reviewed-by: Thomas Huth <thuth@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
This breaks the oss fuzz build:
Testing ./build-oss-fuzz/DEST_DIR/qemu-fuzz-i386-target- ...
=================================================================
==5695==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 8 byte(s) in 1 object(s) allocated from:
#0 0x559931c2a458 in operator new(unsigned long) (/builds/stsquad/qemu/build-oss-fuzz/DEST_DIR/qemu-fuzz-i386-target-+0xcff458) (BuildId: 4656f7dd1ff6e2faf418a79279f4e92db931ba28)
#1 0x7f89125205b7 (/lib64/libtcmalloc_minimal.so.4+0xe5b7) (BuildId: 8eab2cfc91caa7a82e480465400218310b7a341c)
#2 0x7f8917d24cdd in call_init /usr/src/debug/glibc-2.36-9.fc37.x86_64/elf/dl-init.c:70:3
#3 0x7f8917d24cdd in call_init /usr/src/debug/glibc-2.36-9.fc37.x86_64/elf/dl-init.c:26:1
#4 0x7f8917d24dcb in _dl_init /usr/src/debug/glibc-2.36-9.fc37.x86_64/elf/dl-init.c:117:5
#5 0x7f8917d3b8df in _dl_start_user (/lib64/ld-linux-x86-64.so.2+0x1b8df) (BuildId: bb6fec54c7521fddc569a2f4e141dfb97bf3acbe)
SUMMARY: AddressSanitizer: 8 byte(s) leaked in 1 allocation(s).
Cleaning up project directory and file based variables
The actual cause is that libglusterfs-devel pulls in gperftools-libs:
[root@c0ca1c50f5cc /]# yum install libglusterfs-devel
Last metadata expiration check: 0:04:40 ago on Thu 19 Jan 2023 12:24:51 PM UTC.
Dependencies resolved.
============================================================================================================================================================================= Package Architecture Version Repository Size
=============================================================================================================================================================================Installing:
libglusterfs-devel x86_64 10.3-1.fc37 fedora 129 k
Installing dependencies:
gperftools-libs x86_64 2.9.1-4.fc37 fedora 307 k
libgfrpc-devel x86_64 10.3-1.fc37 fedora 46 k
libgfrpc0 x86_64 10.3-1.fc37 fedora 59 k
libgfxdr-devel x86_64 10.3-1.fc37 fedora 9.9 k
libgfxdr0 x86_64 10.3-1.fc37 fedora 31 k
libglusterfs0 x86_64 10.3-1.fc37 fedora 327 k
Transaction Summary
=============================================================================================================================================================================Install 7 Packages
Which brings in gperftools-libs an tcmalloc which then gets in the way
of our build. So either we drop glusterfs on fedora builds or we need
some way to avoid tcmalloc getting in the way.
To try and get the rest of the PR out of the way I think we should drop
this for now unless anyone has an easy solution?
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-01-19 12:33 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-10 13:26 [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 1/8] build-sys: fix crlf-ending C code marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 2/8] .gitlab-ci.d/windows: do not disable opengl marcandre.lureau
2023-01-10 13:26 ` [PATCH v4 3/8] configure: replace Perl usage with sed marcandre.lureau
2023-01-10 13:35 ` Daniel P. Berrangé
2023-01-10 13:26 ` [PATCH v4 4/8] meson: replace Perl usage with Python marcandre.lureau
2023-01-10 13:33 ` Daniel P. Berrangé
2023-01-10 13:26 ` [PATCH v4 5/8] docs: drop texinfo options marcandre.lureau
2023-01-10 13:35 ` Daniel P. Berrangé
2023-01-10 13:26 ` [PATCH v4 6/8] Update lcitool and fedora to 37 marcandre.lureau
2023-01-19 12:29 ` Alex Bennée
2023-01-10 13:26 ` [PATCH v4 7/8] lcitool: drop perl from QEMU project/dependencies marcandre.lureau
2023-01-10 13:36 ` Daniel P. Berrangé
2023-01-10 13:27 ` [PATCH v4 8/8] lcitool: drop texinfo " marcandre.lureau
2023-01-10 13:37 ` Daniel P. Berrangé
2023-01-16 10:06 ` Alex Bennée
2023-01-16 10:21 ` Marc-André Lureau
2023-01-16 14:52 ` Alex Bennée
2023-01-16 10:46 ` Daniel P. Berrangé
2023-01-16 12:09 ` Alex Bennée
2023-01-10 16:35 ` [PATCH v4 0/8] Fix win32/msys2 shader compilation & update lcitool deps Alex Bennée
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.