rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 942112 from home:dfaggioli:devel:Virtualization

Browse Source 
- Fix testsuite failures by not using modules when building tests
  (and some other, also testsuite related, spec file problems)

OBS-URL: https://build.opensuse.org/request/show/942112
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=683
This commit is contained in:
Dario Faggioli 2021-12-22 13:19:53 +00:00 committed by Git OBS Bridge
parent 38f7ac0eef
commit 6c651516cf
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34924e1221d39db283ce02f2e0989a35e3bfb78a6a23f86ca2ce27c74c766542
size 52064
oid sha256:1c7bb0acf48f788bbea9ade9b849b5a2024ccef40d2ab9e2682e7412c87bb413
size 56384

6
qemu.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 22 08:51:15 UTC 2021 - Dario Faggioli <dfaggioli@suse.com>
- Fix testsuite failures by not using modules when building tests
(and some other, also testsuite related, spec file problems)
-------------------------------------------------------------------
Tue Dec 21 04:18:07 UTC 2021 - Lin Ma <lma@suse.com>

12
qemu.spec
View File

@ -1278,6 +1278,10 @@ cd %blddir
%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,8 +1289,6 @@ cd %blddir
--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 \
@ -1588,7 +1590,7 @@ make %{?_smp_mflags} -C %srcdir/roms opensbi64-generic CROSS_COMPILE=
# ------------------------------------------------------------------------
%if "%{name}" == "qemu-testsuite"
# TODO: Some of these are actually overwritten during the following make's
# XXX: What's the point of all this, if we need to rebuild everything anyway?!?
ln -s %_bindir/qemu-img qemu-img
ln -s %_bindir/qemu-ga qemu-ga
ln -s %_bindir/qemu-io qemu-io
@ -1607,8 +1609,8 @@ do
ln -s %_datadir/qemu/$i pc-bios/$i
done
for conf in %{_builddir}/%buildsubdir/default-configs/targets/*-softmmu.mak; do
arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/default-configs/targets/\(.*\)-softmmu.mak|\1|g'`
for conf in %{_builddir}/%buildsubdir/configs/targets/*-softmmu.mak; do
arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/configs/targets/\(.*\)-softmmu.mak|\1|g'`
if $(unlink $arch-softmmu/qemu-system-$arch); then
ln -s %_bindir/qemu-system-$arch $arch-softmmu/qemu-system-$arch
fi

12
qemu.spec.in
View File

@ -1141,6 +1141,10 @@ cd %blddir
%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"
@ -1148,8 +1152,6 @@ cd %blddir
--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 \
@ -1451,7 +1453,7 @@ make %{?_smp_mflags} -C %srcdir/roms opensbi64-generic CROSS_COMPILE=
# ------------------------------------------------------------------------
%if "%{name}" == "qemu-testsuite"
# TODO: Some of these are actually overwritten during the following make's
# XXX: What's the point of all this, if we need to rebuild everything anyway?!?
ln -s %_bindir/qemu-img qemu-img
ln -s %_bindir/qemu-ga qemu-ga
ln -s %_bindir/qemu-io qemu-io
@ -1470,8 +1472,8 @@ do
ln -s %_datadir/qemu/$i pc-bios/$i
done
for conf in %{_builddir}/%buildsubdir/default-configs/targets/*-softmmu.mak; do
arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/default-configs/targets/\(.*\)-softmmu.mak|\1|g'`
for conf in %{_builddir}/%buildsubdir/configs/targets/*-softmmu.mak; do
arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/configs/targets/\(.*\)-softmmu.mak|\1|g'`
if $(unlink $arch-softmmu/qemu-system-$arch); then
ln -s %_bindir/qemu-system-$arch $arch-softmmu/qemu-system-$arch
fi