diff options
| author | Thomas Huth <thuth@redhat.com> | 2024-05-16 10:40:57 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-05-17 11:16:28 +0200 |
| commit | fd77b25bbde962395b93335ade09b6d3127a6537 (patch) | |
| tree | 2f750dd43344a0b30b6bcb8682a3e33220283860 /tests | |
| parent | 9ebe09e633773bebd2dc52b151fb48c1b9b0542a (diff) | |
| download | qemu-fd77b25bbde962395b93335ade09b6d3127a6537.zip qemu-fd77b25bbde962395b93335ade09b6d3127a6537.tar.gz qemu-fd77b25bbde962395b93335ade09b6d3127a6537.tar.bz2 | |
tests/lcitool: Remove g++ from the containers (except for the MinGW one)
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-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lcitool/projects/qemu-minimal.yml | 1 | ||||
| -rw-r--r-- | tests/lcitool/projects/qemu-win-installer.yml | 4 | ||||
| -rw-r--r-- | tests/lcitool/projects/qemu.yml | 1 | ||||
| -rwxr-xr-x | tests/lcitool/refresh | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/tests/lcitool/projects/qemu-minimal.yml b/tests/lcitool/projects/qemu-minimal.yml index d44737d..6bc232a 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 0000000..86aa222 --- /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 9173d1e..b63b6bd 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 174818d..789acef 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")) |