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.
Message-ID: <20240516084059.511463-4-th...@redhat.com>
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
Signed-off-by: Thomas Huth <th...@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
