diff options
| -rw-r--r-- | internal/rosa/meson.go | 2 | ||||
| -rw-r--r-- | internal/rosa/package/qemu/disable-test-qga.patch | 16 | ||||
| -rw-r--r-- | internal/rosa/package/qemu/package.az | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go index d1e8b232..9231880a 100644 --- a/internal/rosa/meson.go +++ b/internal/rosa/meson.go @@ -63,7 +63,7 @@ func (*MesonHelper) paths(t Toolchain) []pkg.ExecPath { c = ['clang', '--target=`+target+`', '--sysroot=/system/`+arch+`'] cpp = ['clang++', '--target=`+target+`', '--sysroot=/system/`+arch+`'] pkg-config = ['pkg-config'] -exe_wrapper = ['qemu-`+mesonArch+`', '-L', '/system/`+arch+`'] +exe_wrapper = ['qemu-`+t.linuxArch()+`', '-L', '/system/`+arch+`'] # Other binaries ar = ['llvm-ar'] diff --git a/internal/rosa/package/qemu/disable-test-qga.patch b/internal/rosa/package/qemu/disable-test-qga.patch new file mode 100644 index 00000000..8778b75f --- /dev/null +++ b/internal/rosa/package/qemu/disable-test-qga.patch @@ -0,0 +1,16 @@ +diff --git a/tests/unit/meson.build b/tests/unit/meson.build +index 885df4c0d6..8e4b1eadaa 100644 +--- a/tests/unit/meson.build ++++ b/tests/unit/meson.build +@@ -169,11 +169,6 @@ if have_system + tests += {'test-qdev': [qom, hwcore]} + endif + +-if have_ga and host_os == 'linux' +- tests += {'test-qga': ['../qtest/libqmp.c', '../qtest/libqtest.c']} +- test_deps += {'test-qga': qga} +-endif +- + test_env = environment() + test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) + test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) diff --git a/internal/rosa/package/qemu/package.az b/internal/rosa/package/qemu/package.az index 7df25576..2c090e9e 100644 --- a/internal/rosa/package/qemu/package.az +++ b/internal/rosa/package/qemu/package.az @@ -16,6 +16,8 @@ package qemu { "disable-mcast-test.patch", // fails with ipv6 disabled "disable-netdev-socket.patch", + // fails with ppc64 targets enabled + "disable-test-qga.patch", // fails on a slower machine "copy-before-write-spurious.patch", @@ -52,7 +54,6 @@ sed -i \ // fails to load firmware "ppc-linux-user", "ppc64-linux-user", - "ppc64le-linux-user", "ppc-softmmu", "ppc64-softmmu", |