Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in
at 2022-02-01 14:02:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Tue Feb 1 14:02:26 2022 rev:219 rq:949704 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2022-01-14
23:13:28.618640932 +0100
+++ /work/SRC/openSUSE:Factory/.qemu.new.1898/qemu.changes 2022-02-01
14:02:30.492257325 +0100
@@ -1,0 +2,11 @@
+Sun Jan 23 15:13:19 UTC 2022 - Li Zhang <li.zh...@suse.com>
+
+- Enable modules for testsuite
+
+-------------------------------------------------------------------
+Mon Jan 17 09:37:30 UTC 2022 - Li Zhang <li.zh...@suse.com>
+
+* Patches added:
+ meson-build-all-modules-by-default.patch
+
+-------------------------------------------------------------------
New:
----
meson-build-all-modules-by-default.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.Y7BBtv/_old 2022-02-01 14:02:33.136239203 +0100
+++ /var/tmp/diff_new_pack.Y7BBtv/_new 2022-02-01 14:02:33.140239176 +0100
@@ -1,5 +1,5 @@
#
-# spec file
+# spec file for package qemu
#
# Copyright (c) 2022 SUSE LLC
#
@@ -179,6 +179,7 @@
Patch00044: modules-quick-fix-a-fundamental-error-in.patch
Patch00045: qemu-binfmt-conf.sh-allow-overriding-SUS.patch
Patch00046: scsi-generic-replace-logical-block-count.patch
+Patch00047: meson-build-all-modules-by-default.patch
# Patches applied in roms/seabios/:
Patch01000: seabios-use-python2-explicitly-as-needed.patch
Patch01001: seabios-switch-to-python3-as-needed.patch
@@ -1125,6 +1126,7 @@
%patch00044 -p1
%patch00045 -p1
%patch00046 -p1
+%patch00047 -p1
%patch01000 -p1
%patch01001 -p1
%patch01002 -p1
@@ -1274,10 +1276,6 @@
%endif
%if "%flavor" != "testsuite"
--disable-qom-cast-debug \
- --enable-modules \
- --disable-module-upgrades \
-%else
- --disable-modules \
%endif
--with-git-submodules=ignore \
%if "%{name}" != "qemu-linux-user"
@@ -1285,6 +1283,8 @@
--with-default-devices \
--enable-system --disable-linux-user \
--enable-tools --enable-guest-agent \
+ --enable-modules \
+ --disable-module-upgrades \
--enable-slirp=system \
--enable-pie \
--enable-docs \
++++++ bundles.tar.xz ++++++
Binary files old/44f28df24767cf9dca1ddc9b23157737c4cbb645.bundle and
new/44f28df24767cf9dca1ddc9b23157737c4cbb645.bundle differ
++++++ meson-build-all-modules-by-default.patch ++++++
From: Paolo Bonzini <pbonz...@redhat.com>
Date: Fri, 7 Jan 2022 13:00:44 +0100
Subject: meson: build all modules by default
Git-commit: fb72176ba64057ce0ee5c1a0a443d9f72e270636
With more recent versions of Meson, the build.ninja file is more selective
as to what is built by default, and not building the modules results in test
failures.
Mark the modules as built-by-default and, to make the dependencies more
precise, also require them to be up-to-date before running tests.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/801
Tested-by: Li Zhang <lizh...@suse.de>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Li Zhang <lizh...@suse.de>
---
meson.build | 4 +++-
tests/qtest/meson.build | 3 +--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 612da7167f5c4aafcf77a0e1ce55..4997739df656a10fa1822116102a 100644
--- a/meson.build
+++ b/meson.build
@@ -2818,8 +2818,10 @@ common_ss.add(hwcore)
# Targets #
###########
+emulator_modules = []
foreach m : block_mods + softmmu_mods
- shared_module(m.name(),
+ emulator_modules += shared_module(m.name(),
+ build_by_default: true,
name_prefix: '',
link_whole: m,
install: true,
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index c9d8458062ff6b88d1c28cb21e8f..6aff75bafa5761da141f27e6b1ee 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -299,10 +299,9 @@ foreach dir : target_dirs
test: executable(test, src, dependencies: deps)
}
endif
- # FIXME: missing dependency on the emulator binary and qemu-img
test('qtest-@0@/@1@'.format(target_base, test),
qtest_executables[test],
- depends: [test_deps, qtest_emulator],
+ depends: [test_deps, qtest_emulator, emulator_modules],
env: qtest_env,
args: ['--tap', '-k'],
protocol: 'tap',
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.Y7BBtv/_old 2022-02-01 14:02:33.800234652 +0100
+++ /var/tmp/diff_new_pack.Y7BBtv/_new 2022-02-01 14:02:33.804234625 +0100
@@ -1141,10 +1141,6 @@
%endif
%if "%flavor" != "testsuite"
--disable-qom-cast-debug \
- --enable-modules \
- --disable-module-upgrades \
-%else
- --disable-modules \
%endif
--with-git-submodules=ignore \
%if "%{name}" != "qemu-linux-user"
@@ -1152,6 +1148,8 @@
--with-default-devices \
--enable-system --disable-linux-user \
--enable-tools --enable-guest-agent \
+ --enable-modules \
+ --disable-module-upgrades \
--enable-slirp=system \
--enable-pie \
--enable-docs \
