* [PATCH v2 0/5] tests: Remove xfsprogs and g++ from the dockerfiles
@ 2024-05-16 8:40 Thomas Huth
2024-05-16 8:40 ` [PATCH v2 1/5] tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes Thomas Huth
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Thomas Huth @ 2024-05-16 8:40 UTC (permalink / raw)
To: qemu-devel, Daniel P . Berrangé
Cc: Alex Bennée, Philippe Mathieu-Daudé
The xfsprogs package is not necessary anymore since commit a5730b8bd3
and we don't need g++ in any of the containers (except for the mingw
cross compiler container which can be handled differently), so this
patch series simplifies the dockerfiles a little bit accordingly.
v2:
- Include the "Treat the output of lcitool as text" patch
(suggestion by Daniel)
- Handle the g++ in the fedora-win64-cross container via a separate
file in tests/lcitool/projects instead of a hack in the refresh script
PS: I originally wanted to include an update to the libvirt-ci submodule
in this series to be able to add the mingw-w64-tools package, too,
but that would require an update of the Fedora 38 containers to a
newer version - and this is causing lots of unresolved problems like
failures in the fuzzer or avocado jobs, so this has to be postponed
until these other issues are resolved.
Philippe Mathieu-Daudé (1):
tests/lcitool: Remove 'xfsprogs' from QEMU
Thomas Huth (4):
tests/lcitool/refresh: Treat the output of lcitool as text, not as
bytes
tests/lcitool: Remove g++ from the containers (except for the MinGW
one)
tests/lcitool/projects/qemu.yml: Sort entries alphabetically again
tests/docker/dockerfiles: Update container files with
"lcitool-refresh"
tests/docker/dockerfiles/alpine.docker | 4 ----
tests/docker/dockerfiles/centos9.docker | 4 ----
.../dockerfiles/debian-amd64-cross.docker | 4 ----
.../dockerfiles/debian-arm64-cross.docker | 4 ----
.../dockerfiles/debian-armel-cross.docker | 4 ----
.../dockerfiles/debian-armhf-cross.docker | 4 ----
.../dockerfiles/debian-i686-cross.docker | 4 ----
.../dockerfiles/debian-mips64el-cross.docker | 4 ----
.../dockerfiles/debian-mipsel-cross.docker | 4 ----
.../dockerfiles/debian-ppc64el-cross.docker | 4 ----
.../dockerfiles/debian-riscv64-cross.docker | 3 ---
.../dockerfiles/debian-s390x-cross.docker | 4 ----
tests/docker/dockerfiles/debian.docker | 4 ----
.../dockerfiles/fedora-win64-cross.docker | 2 +-
tests/docker/dockerfiles/fedora.docker | 4 ----
tests/docker/dockerfiles/opensuse-leap.docker | 4 ----
tests/docker/dockerfiles/ubuntu2204.docker | 4 ----
tests/lcitool/projects/qemu-minimal.yml | 1 -
tests/lcitool/projects/qemu-win-installer.yml | 4 ++++
tests/lcitool/projects/qemu.yml | 18 ++++++++----------
tests/lcitool/refresh | 5 +++--
21 files changed, 16 insertions(+), 77 deletions(-)
create mode 100644 tests/lcitool/projects/qemu-win-installer.yml
--
2.45.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 1/5] tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes
2024-05-16 8:40 [PATCH v2 0/5] tests: Remove xfsprogs and g++ from the dockerfiles Thomas Huth
@ 2024-05-16 8:40 ` Thomas Huth
2024-05-16 8:55 ` Daniel P. Berrangé
2024-05-16 8:40 ` [PATCH v2 2/5] tests/lcitool: Remove 'xfsprogs' from QEMU Thomas Huth
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Thomas Huth @ 2024-05-16 8:40 UTC (permalink / raw)
To: qemu-devel, Daniel P . Berrangé
Cc: Alex Bennée, Philippe Mathieu-Daudé
In case lcitool fails (e.g. with a python backtrace), this makes
the output of lcitool much more readable.
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/lcitool/refresh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 24a735a3f2..174818d9c9 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -43,12 +43,12 @@ def atomic_write(filename, content):
def generate(filename, cmd, trailer):
print("Generate %s" % filename)
- lcitool = subprocess.run(cmd, capture_output=True)
+ lcitool = subprocess.run(cmd, capture_output=True, encoding='utf8')
if lcitool.returncode != 0:
raise Exception("Failed to generate %s: %s" % (filename, lcitool.stderr))
- content = lcitool.stdout.decode("utf8")
+ content = lcitool.stdout
if trailer is not None:
content += trailer
atomic_write(filename, content)
--
2.45.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 2/5] tests/lcitool: Remove 'xfsprogs' from QEMU
2024-05-16 8:40 [PATCH v2 0/5] tests: Remove xfsprogs and g++ from the dockerfiles Thomas Huth
2024-05-16 8:40 ` [PATCH v2 1/5] tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes Thomas Huth
@ 2024-05-16 8:40 ` Thomas Huth
2024-05-16 8:55 ` Daniel P. Berrangé
2024-05-16 8:40 ` [PATCH v2 3/5] tests/lcitool: Remove g++ from the containers (except for the MinGW one) Thomas Huth
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Thomas Huth @ 2024-05-16 8:40 UTC (permalink / raw)
To: qemu-devel, Daniel P . Berrangé
Cc: Alex Bennée, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@linaro.org>
QEMU's commit a5730b8bd3 ("block/file-posix: Simplify the
XFS_IOC_DIOINFO handling") removed the need for the 'xfsprogs'
package.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[thuth: Adjusted the patch from the lcitools repo to QEMU's repo]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/lcitool/projects/qemu.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 149b15de57..9173d1e36e 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -121,7 +121,6 @@ packages:
- vte
- which
- xen
- - xfsprogs
- xorriso
- zstdtools
- zlib
--
2.45.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 3/5] tests/lcitool: Remove g++ from the containers (except for the MinGW one)
2024-05-16 8:40 [PATCH v2 0/5] tests: Remove xfsprogs and g++ from the dockerfiles Thomas Huth
2024-05-16 8:40 ` [PATCH v2 1/5] tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes Thomas Huth
2024-05-16 8:40 ` [PATCH v2 2/5] tests/lcitool: Remove 'xfsprogs' from QEMU Thomas Huth
@ 2024-05-16 8:40 ` Thomas Huth
2024-05-16 8:56 ` Daniel P. Berrangé
2024-05-16 8:40 ` [PATCH v2 4/5] tests/lcitool/projects/qemu.yml: Sort entries alphabetically again Thomas Huth
2024-05-16 8:40 ` [PATCH v2 5/5] tests/docker/dockerfiles: Update container files with "lcitool-refresh" Thomas Huth
4 siblings, 1 reply; 11+ messages in thread
From: Thomas Huth @ 2024-05-16 8:40 UTC (permalink / raw)
To: qemu-devel, Daniel P . Berrangé
Cc: Alex Bennée, Philippe Mathieu-Daudé
We don't need C++ for the normal QEMU builds anymore, so installing
g++ in each and every container seems to be a waste of time and disk
space. The only container that still needs it is the Fedora MinGW
container that builds the only remaining C++ code in ./qga/vss-win32/
and we can install it there with an extra project yml file instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/lcitool/projects/qemu-minimal.yml | 1 -
tests/lcitool/projects/qemu-win-installer.yml | 4 ++++
tests/lcitool/projects/qemu.yml | 1 -
tests/lcitool/refresh | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 tests/lcitool/projects/qemu-win-installer.yml
diff --git a/tests/lcitool/projects/qemu-minimal.yml b/tests/lcitool/projects/qemu-minimal.yml
index d44737dc1d..6bc232a1c3 100644
--- a/tests/lcitool/projects/qemu-minimal.yml
+++ b/tests/lcitool/projects/qemu-minimal.yml
@@ -7,7 +7,6 @@ packages:
- ccache
- findutils
- flex
- - g++
- gcc
- gcc-native
- glib2
diff --git a/tests/lcitool/projects/qemu-win-installer.yml b/tests/lcitool/projects/qemu-win-installer.yml
new file mode 100644
index 0000000000..86aa22297c
--- /dev/null
+++ b/tests/lcitool/projects/qemu-win-installer.yml
@@ -0,0 +1,4 @@
+# Additional packages that are required to build the code in qga/vss-win32/
+---
+packages:
+ - g++
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 9173d1e36e..b63b6bd850 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -22,7 +22,6 @@ packages:
- findutils
- flex
- fuse3
- - g++
- gcc
- gcc-native
- gcovr
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 174818d9c9..789acefb75 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -192,6 +192,7 @@ try:
"s390x-softmmu,s390x-linux-user"))
generate_dockerfile("fedora-win64-cross", "fedora-38",
+ project='qemu,qemu-win-installer',
cross="mingw64",
trailer=cross_build("x86_64-w64-mingw32-",
"x86_64-softmmu"))
--
2.45.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 4/5] tests/lcitool/projects/qemu.yml: Sort entries alphabetically again
2024-05-16 8:40 [PATCH v2 0/5] tests: Remove xfsprogs and g++ from the dockerfiles Thomas Huth
` (2 preceding siblings ...)
2024-05-16 8:40 ` [PATCH v2 3/5] tests/lcitool: Remove g++ from the containers (except for the MinGW one) Thomas Huth
@ 2024-05-16 8:40 ` Thomas Huth
2024-05-16 8:56 ` Daniel P. Berrangé
2024-05-16 8:40 ` [PATCH v2 5/5] tests/docker/dockerfiles: Update container files with "lcitool-refresh" Thomas Huth
4 siblings, 1 reply; 11+ messages in thread
From: Thomas Huth @ 2024-05-16 8:40 UTC (permalink / raw)
To: qemu-devel, Daniel P . Berrangé
Cc: Alex Bennée, Philippe Mathieu-Daudé
Let's try to keep the entries in alphabetical order here!
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/lcitool/projects/qemu.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index b63b6bd850..7511ec7ccb 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -35,8 +35,8 @@ packages:
- hostname
- json-c
- libaio
- - libattr
- libasan
+ - libattr
- libbpf
- libc-static
- libcacard
@@ -54,6 +54,7 @@ packages:
- libjpeg
- libnfs
- libnuma
+ - libpipewire-dev
- libpmem
- libpng
- librbd
@@ -73,27 +74,26 @@ packages:
- llvm
- lttng-ust
- lzo
+ - make
+ - mesa-libgbm
+ - meson
- mtools
+ - ncursesw
- netcat
- nettle
- ninja
- nsis
- - make
- - mesa-libgbm
- - meson
- - ncursesw
- pam
- pcre-static
- pixman
- - libpipewire-dev
- pkg-config
- pulseaudio
- python3
- - python3-PyYAML
- python3-numpy
- python3-opencv
- python3-pillow
- python3-pip
+ - python3-PyYAML
- python3-sphinx
- python3-sphinx-rtd-theme
- python3-sqlite3
@@ -121,6 +121,6 @@ packages:
- which
- xen
- xorriso
- - zstdtools
- zlib
- zlib-static
+ - zstdtools
--
2.45.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 5/5] tests/docker/dockerfiles: Update container files with "lcitool-refresh"
2024-05-16 8:40 [PATCH v2 0/5] tests: Remove xfsprogs and g++ from the dockerfiles Thomas Huth
` (3 preceding siblings ...)
2024-05-16 8:40 ` [PATCH v2 4/5] tests/lcitool/projects/qemu.yml: Sort entries alphabetically again Thomas Huth
@ 2024-05-16 8:40 ` Thomas Huth
2024-05-16 8:59 ` Daniel P. Berrangé
4 siblings, 1 reply; 11+ messages in thread
From: Thomas Huth @ 2024-05-16 8:40 UTC (permalink / raw)
To: qemu-devel, Daniel P . Berrangé
Cc: Alex Bennée, Philippe Mathieu-Daudé
Run "make lcitool-refresh" after the previous changes to the
lcitool files. This removes the g++ and xfslibs-dev packages
from the dockerfiles (except for the fedora-win64-cross dockerfile
where we keep the C++ compiler).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/docker/dockerfiles/alpine.docker | 4 ----
tests/docker/dockerfiles/centos9.docker | 4 ----
tests/docker/dockerfiles/debian-amd64-cross.docker | 4 ----
tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ----
tests/docker/dockerfiles/debian-armel-cross.docker | 4 ----
tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ----
tests/docker/dockerfiles/debian-i686-cross.docker | 4 ----
tests/docker/dockerfiles/debian-mips64el-cross.docker | 4 ----
tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ----
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 4 ----
tests/docker/dockerfiles/debian-riscv64-cross.docker | 3 ---
tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ----
tests/docker/dockerfiles/debian.docker | 4 ----
tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +-
tests/docker/dockerfiles/fedora.docker | 4 ----
tests/docker/dockerfiles/opensuse-leap.docker | 4 ----
tests/docker/dockerfiles/ubuntu2204.docker | 4 ----
17 files changed, 1 insertion(+), 64 deletions(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index cd9d7af1ce..554464f31e 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -32,7 +32,6 @@ RUN apk update && \
findutils \
flex \
fuse3-dev \
- g++ \
gcc \
gcovr \
gettext \
@@ -110,7 +109,6 @@ RUN apk update && \
vte3-dev \
which \
xen-dev \
- xfsprogs-dev \
xorriso \
zlib-dev \
zlib-static \
@@ -119,10 +117,8 @@ RUN apk update && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
apk list --installed | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker
index 6cf47ce786..0256865b9e 100644
--- a/tests/docker/dockerfiles/centos9.docker
+++ b/tests/docker/dockerfiles/centos9.docker
@@ -34,7 +34,6 @@ RUN dnf distro-sync -y && \
flex \
fuse3-devel \
gcc \
- gcc-c++ \
gettext \
git \
glib2-devel \
@@ -115,7 +114,6 @@ RUN dnf distro-sync -y && \
util-linux \
vte291-devel \
which \
- xfsprogs-devel \
xorriso \
zlib-devel \
zlib-static \
@@ -125,10 +123,8 @@ RUN dnf distro-sync -y && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
rpm -qa | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index d0b0e9778e..f8c61d1191 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-x86-64-linux-gnu \
gcc-x86-64-linux-gnu \
libaio-dev:amd64 \
libasan6:amd64 \
@@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:amd64 \
nettle-dev:amd64 \
systemtap-sdt-dev:amd64 \
- xfslibs-dev:amd64 \
zlib1g-dev:amd64 && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -167,9 +165,7 @@ cpu = 'x86_64'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/x86_64-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-gcc
ENV ABI "x86_64-linux-gnu"
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 8cb225740e..6510872279 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-aarch64-linux-gnu \
gcc-aarch64-linux-gnu \
libaio-dev:arm64 \
libasan6:arm64 \
@@ -148,7 +147,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:arm64 \
nettle-dev:arm64 \
systemtap-sdt-dev:arm64 \
- xfslibs-dev:arm64 \
zlib1g-dev:arm64 && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -166,9 +164,7 @@ cpu = 'aarch64'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc
ENV ABI "aarch64-linux-gnu"
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index e6f37418ed..f227d42987 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-arm-linux-gnueabi \
gcc-arm-linux-gnueabi \
libaio-dev:armel \
libasan6:armel \
@@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:armel \
nettle-dev:armel \
systemtap-sdt-dev:armel \
- xfslibs-dev:armel \
zlib1g-dev:armel && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -167,9 +165,7 @@ cpu = 'arm'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
ENV ABI "arm-linux-gnueabi"
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 407a014f57..58bdf07223 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-arm-linux-gnueabihf \
gcc-arm-linux-gnueabihf \
libaio-dev:armhf \
libasan6:armhf \
@@ -148,7 +147,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:armhf \
nettle-dev:armhf \
systemtap-sdt-dev:armhf \
- xfslibs-dev:armhf \
zlib1g-dev:armhf && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -166,9 +164,7 @@ cpu = 'armhf'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc
ENV ABI "arm-linux-gnueabihf"
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index bdc9566b67..9f4102be8f 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-i686-linux-gnu \
gcc-i686-linux-gnu \
libaio-dev:i386 \
libasan6:i386 \
@@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:i386 \
nettle-dev:i386 \
systemtap-sdt-dev:i386 \
- xfslibs-dev:i386 \
zlib1g-dev:i386 && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -167,9 +165,7 @@ cpu = 'i686'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc
ENV ABI "i686-linux-gnu"
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 4d995d0b12..c861c3bd5b 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-mips64el-linux-gnuabi64 \
gcc-mips64el-linux-gnuabi64 \
libaio-dev:mips64el \
libasound2-dev:mips64el \
@@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:mips64el \
nettle-dev:mips64el \
systemtap-sdt-dev:mips64el \
- xfslibs-dev:mips64el \
zlib1g-dev:mips64el && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -165,9 +163,7 @@ cpu = 'mips64el'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc
ENV ABI "mips64el-linux-gnuabi64"
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index 0cf803bda5..fe9415395e 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-mipsel-linux-gnu \
gcc-mipsel-linux-gnu \
libaio-dev:mipsel \
libasound2-dev:mipsel \
@@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:mipsel \
nettle-dev:mipsel \
systemtap-sdt-dev:mipsel \
- xfslibs-dev:mipsel \
zlib1g-dev:mipsel && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -165,9 +163,7 @@ cpu = 'mipsel'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc
ENV ABI "mipsel-linux-gnu"
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 6180ec08c3..35c8ff0864 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-powerpc64le-linux-gnu \
gcc-powerpc64le-linux-gnu \
libaio-dev:ppc64el \
libasan6:ppc64el \
@@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:ppc64el \
nettle-dev:ppc64el \
systemtap-sdt-dev:ppc64el \
- xfslibs-dev:ppc64el \
zlib1g-dev:ppc64el && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -165,9 +163,7 @@ cpu = 'powerpc64le'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc
ENV ABI "powerpc64le-linux-gnu"
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index 591572ae94..4d8ca83cb3 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -51,7 +51,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-riscv64-linux-gnu \
gcc-riscv64-linux-gnu \
libc6-dev:riscv64 \
libfdt-dev:riscv64 \
@@ -74,9 +73,7 @@ cpu = 'riscv64'\n\
endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc
ENV ABI "riscv64-linux-gnu"
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 90c8d3c7b8..bef9dff17a 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
eatmydata apt-get install --no-install-recommends -y \
- g++-s390x-linux-gnu \
gcc-s390x-linux-gnu \
libaio-dev:s390x \
libasan6:s390x \
@@ -146,7 +145,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libzstd-dev:s390x \
nettle-dev:s390x \
systemtap-sdt-dev:s390x \
- xfslibs-dev:s390x \
zlib1g-dev:s390x && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
@@ -164,9 +162,7 @@ cpu = 's390x'\n\
endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc
ENV ABI "s390x-linux-gnu"
diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker
index 5722482e4c..63d7aac616 100644
--- a/tests/docker/dockerfiles/debian.docker
+++ b/tests/docker/dockerfiles/debian.docker
@@ -25,7 +25,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
exuberant-ctags \
findutils \
flex \
- g++ \
gcc \
gcovr \
gettext \
@@ -129,7 +128,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
- xfslibs-dev \
xorriso \
zlib1g-dev \
zstd && \
@@ -140,10 +138,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index d1a480fa71..0f78711876 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu
+# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu,qemu-win-installer
#
# https://gitlab.com/libvirt/libvirt-ci
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 7e6ab0308a..098c894d10 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -41,7 +41,6 @@ exec "$@"\n' > /usr/bin/nosync && \
flex \
fuse3-devel \
gcc \
- gcc-c++ \
gcovr \
gettext \
git \
@@ -130,7 +129,6 @@ exec "$@"\n' > /usr/bin/nosync && \
vte291-devel \
which \
xen-devel \
- xfsprogs-devel \
xorriso \
zlib-devel \
zlib-static \
@@ -140,10 +138,8 @@ exec "$@"\n' > /usr/bin/nosync && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
rpm -qa | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index c4055bdd10..836f531ac1 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -26,7 +26,6 @@ RUN zypper update -y && \
flex \
fuse3-devel \
gcc \
- gcc-c++ \
gcovr \
gettext-runtime \
git \
@@ -113,7 +112,6 @@ RUN zypper update -y && \
vte-devel \
which \
xen-devel \
- xfsprogs-devel \
xorriso \
zlib-devel \
zlib-devel-static \
@@ -122,10 +120,8 @@ RUN zypper update -y && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
rpm -qa | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN /usr/bin/pip3.11 install \
diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker
index b8e78331db..febd25b320 100644
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@@ -25,7 +25,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
exuberant-ctags \
findutils \
flex \
- g++ \
gcc \
gcovr \
gettext \
@@ -129,7 +128,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \
tesseract-ocr \
tesseract-ocr-eng \
- xfslibs-dev \
xorriso \
zlib1g-dev \
zstd && \
@@ -140,10 +138,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--
2.45.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/5] tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes
2024-05-16 8:40 ` [PATCH v2 1/5] tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes Thomas Huth
@ 2024-05-16 8:55 ` Daniel P. Berrangé
0 siblings, 0 replies; 11+ messages in thread
From: Daniel P. Berrangé @ 2024-05-16 8:55 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, Alex Bennée, Philippe Mathieu-Daudé
On Thu, May 16, 2024 at 10:40:55AM +0200, Thomas Huth wrote:
> In case lcitool fails (e.g. with a python backtrace), this makes
> the output of lcitool much more readable.
>
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/lcitool/refresh | 4 ++--
> 1 file changed, 2 insertions(+), 2 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] 11+ messages in thread
* Re: [PATCH v2 2/5] tests/lcitool: Remove 'xfsprogs' from QEMU
2024-05-16 8:40 ` [PATCH v2 2/5] tests/lcitool: Remove 'xfsprogs' from QEMU Thomas Huth
@ 2024-05-16 8:55 ` Daniel P. Berrangé
0 siblings, 0 replies; 11+ messages in thread
From: Daniel P. Berrangé @ 2024-05-16 8:55 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, Alex Bennée, Philippe Mathieu-Daudé
On Thu, May 16, 2024 at 10:40:56AM +0200, Thomas Huth wrote:
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
>
> QEMU's commit a5730b8bd3 ("block/file-posix: Simplify the
> XFS_IOC_DIOINFO handling") removed the need for the 'xfsprogs'
> package.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> [thuth: Adjusted the patch from the lcitools repo to QEMU's repo]
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/lcitool/projects/qemu.yml | 1 -
> 1 file changed, 1 deletion(-)
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] 11+ messages in thread
* Re: [PATCH v2 3/5] tests/lcitool: Remove g++ from the containers (except for the MinGW one)
2024-05-16 8:40 ` [PATCH v2 3/5] tests/lcitool: Remove g++ from the containers (except for the MinGW one) Thomas Huth
@ 2024-05-16 8:56 ` Daniel P. Berrangé
0 siblings, 0 replies; 11+ messages in thread
From: Daniel P. Berrangé @ 2024-05-16 8:56 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, Alex Bennée, Philippe Mathieu-Daudé
On Thu, May 16, 2024 at 10:40:57AM +0200, Thomas Huth wrote:
> We don't need C++ for the normal QEMU builds anymore, so installing
> g++ in each and every container seems to be a waste of time and disk
> space. The only container that still needs it is the Fedora MinGW
> container that builds the only remaining C++ code in ./qga/vss-win32/
> and we can install it there with an extra project yml file instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/lcitool/projects/qemu-minimal.yml | 1 -
> tests/lcitool/projects/qemu-win-installer.yml | 4 ++++
> tests/lcitool/projects/qemu.yml | 1 -
> tests/lcitool/refresh | 1 +
> 4 files changed, 5 insertions(+), 2 deletions(-)
> create mode 100644 tests/lcitool/projects/qemu-win-installer.yml
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] 11+ messages in thread
* Re: [PATCH v2 4/5] tests/lcitool/projects/qemu.yml: Sort entries alphabetically again
2024-05-16 8:40 ` [PATCH v2 4/5] tests/lcitool/projects/qemu.yml: Sort entries alphabetically again Thomas Huth
@ 2024-05-16 8:56 ` Daniel P. Berrangé
0 siblings, 0 replies; 11+ messages in thread
From: Daniel P. Berrangé @ 2024-05-16 8:56 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, Alex Bennée, Philippe Mathieu-Daudé
On Thu, May 16, 2024 at 10:40:58AM +0200, Thomas Huth wrote:
> Let's try to keep the entries in alphabetical order here!
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/lcitool/projects/qemu.yml | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 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] 11+ messages in thread
* Re: [PATCH v2 5/5] tests/docker/dockerfiles: Update container files with "lcitool-refresh"
2024-05-16 8:40 ` [PATCH v2 5/5] tests/docker/dockerfiles: Update container files with "lcitool-refresh" Thomas Huth
@ 2024-05-16 8:59 ` Daniel P. Berrangé
0 siblings, 0 replies; 11+ messages in thread
From: Daniel P. Berrangé @ 2024-05-16 8:59 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, Alex Bennée, Philippe Mathieu-Daudé
On Thu, May 16, 2024 at 10:40:59AM +0200, Thomas Huth wrote:
> Run "make lcitool-refresh" after the previous changes to the
> lcitool files. This removes the g++ and xfslibs-dev packages
> from the dockerfiles (except for the fedora-win64-cross dockerfile
> where we keep the C++ compiler).
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/docker/dockerfiles/alpine.docker | 4 ----
> tests/docker/dockerfiles/centos9.docker | 4 ----
> tests/docker/dockerfiles/debian-amd64-cross.docker | 4 ----
> tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ----
> tests/docker/dockerfiles/debian-armel-cross.docker | 4 ----
> tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ----
> tests/docker/dockerfiles/debian-i686-cross.docker | 4 ----
> tests/docker/dockerfiles/debian-mips64el-cross.docker | 4 ----
> tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ----
> tests/docker/dockerfiles/debian-ppc64el-cross.docker | 4 ----
> tests/docker/dockerfiles/debian-riscv64-cross.docker | 3 ---
> tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ----
> tests/docker/dockerfiles/debian.docker | 4 ----
> tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +-
> tests/docker/dockerfiles/fedora.docker | 4 ----
> tests/docker/dockerfiles/opensuse-leap.docker | 4 ----
> tests/docker/dockerfiles/ubuntu2204.docker | 4 ----
> 17 files changed, 1 insertion(+), 64 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] 11+ messages in thread
end of thread, other threads:[~2024-05-16 9:00 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-16 8:40 [PATCH v2 0/5] tests: Remove xfsprogs and g++ from the dockerfiles Thomas Huth
2024-05-16 8:40 ` [PATCH v2 1/5] tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes Thomas Huth
2024-05-16 8:55 ` Daniel P. Berrangé
2024-05-16 8:40 ` [PATCH v2 2/5] tests/lcitool: Remove 'xfsprogs' from QEMU Thomas Huth
2024-05-16 8:55 ` Daniel P. Berrangé
2024-05-16 8:40 ` [PATCH v2 3/5] tests/lcitool: Remove g++ from the containers (except for the MinGW one) Thomas Huth
2024-05-16 8:56 ` Daniel P. Berrangé
2024-05-16 8:40 ` [PATCH v2 4/5] tests/lcitool/projects/qemu.yml: Sort entries alphabetically again Thomas Huth
2024-05-16 8:56 ` Daniel P. Berrangé
2024-05-16 8:40 ` [PATCH v2 5/5] tests/docker/dockerfiles: Update container files with "lcitool-refresh" Thomas Huth
2024-05-16 8:59 ` Daniel P. Berrangé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).