The package rpms/qemu.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=d9af2bbdff861...
https://src.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=13e7c30edf2da...
https://src.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=3c0f9e810a0b2....
Change:
+%ifarch %{arm} aarch64
-%ifarch %{kernel_arches}
-%ifarch s390
Thanks.
Full change:
============
commit d9af2bbdff8613c35c44d4a0ea29abcbf0065b68
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Fri Sep 4 11:03:27 2020 +0100
Make QEMU sanity check a build blocker
If it ever breaks, it can be skipped by setting the %qemu_sanity_check
variable to 0.
This ensures it does not bit-rot again in future and actually adds some
value to the build.
It has to be skipped for ARM for now due to inability to select the
machine type.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index 0eb999d..0a78ac8 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -86,6 +86,13 @@
%endif
%endif
+# QEMU sanity check doesn't know how to pick machine type
+# which is needed on ARM as there is no defualt
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1875763
+%ifarch %{arm} aarch64
+%global qemu_sanity_check 0
+%endif
+
# All modules should be listed here.
%ifarch %{ix86} %{arm}
%define with_block_rbd 0
@@ -1414,10 +1421,9 @@ if [ -x "$b" ]; then "$b" -help; fi
%if %{qemu_sanity_check}
# Sanity-check current kernel can boot on this qemu.
-# The results are advisory only.
KERNEL=`find /lib/modules -name vmlinuz | head -1`
echo "Trying to boot kernel $KERNEL with %{?hostqemu}"
-qemu-sanity-check --qemu=%{?hostqemu} --kernel=$KERNEL ||:
+qemu-sanity-check --qemu=%{?hostqemu} --kernel=$KERNEL
%endif
%endif
@@ -1906,6 +1912,7 @@ getent passwd qemu >/dev/null || \
- Fix conditionals for enabling QEMU sanity check
- Check whether emulator works before doing sanity check
- Provide explicit kernel path for QEMU sanity check
+- Make QEMU sanity check a build blocker
* Thu Sep 3 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-4
- Add btrfs ioctls to linux-user (rhbz #1872918)
commit f2839fea71ecc8dbe7e38c0ec09e3e9ef6edb831
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Fri Sep 4 10:49:53 2020 +0100
Provide explicit kernel path to QEMU sanity check
In a mock build root the kernel probably won't exist in /boot and the
QEMU sanity check script won't search /lib/modules. So we must find the
vmlinuz file and pass it explicitly.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index 2aa30f8..0eb999d 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1415,7 +1415,9 @@ if [ -x "$b" ]; then "$b" -help; fi
%if %{qemu_sanity_check}
# Sanity-check current kernel can boot on this qemu.
# The results are advisory only.
-qemu-sanity-check --qemu=%{?hostqemu} ||:
+KERNEL=`find /lib/modules -name vmlinuz | head -1`
+echo "Trying to boot kernel $KERNEL with %{?hostqemu}"
+qemu-sanity-check --qemu=%{?hostqemu} --kernel=$KERNEL ||:
%endif
%endif
@@ -1903,6 +1905,7 @@ getent passwd qemu >/dev/null || \
- Re-enable kernel BR for QEMU sanity check
- Fix conditionals for enabling QEMU sanity check
- Check whether emulator works before doing sanity check
+- Provide explicit kernel path for QEMU sanity check
* Thu Sep 3 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-4
- Add btrfs ioctls to linux-user (rhbz #1872918)
commit af50bf7b783cee59cdf348e9263d5bb4a848148b
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Fri Sep 4 10:44:52 2020 +0100
Check whether emulator works before doing sanity check
If the emulator binary can't run, then the sanity check is never going
to work either.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index 9530011..2aa30f8 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1408,16 +1408,16 @@ pushd build-dynamic
make check V=1
%endif
+# Check the binary runs (see eg RHBZ#998722).
+b="./x86_64-softmmu/qemu-system-x86_64"
+if [ -x "$b" ]; then "$b" -help; fi
+
%if %{qemu_sanity_check}
# Sanity-check current kernel can boot on this qemu.
# The results are advisory only.
qemu-sanity-check --qemu=%{?hostqemu} ||:
%endif
-# Check the binary runs (see eg RHBZ#998722).
-b="./x86_64-softmmu/qemu-system-x86_64"
-if [ -x "$b" ]; then "$b" -help; fi
-
%endif
popd
@@ -1902,6 +1902,7 @@ getent passwd qemu >/dev/null || \
- Fix host qemu binary path for aarch64
- Re-enable kernel BR for QEMU sanity check
- Fix conditionals for enabling QEMU sanity check
+- Check whether emulator works before doing sanity check
* Thu Sep 3 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-4
- Add btrfs ioctls to linux-user (rhbz #1872918)
commit 13e7c30edf2da5fac2a78ec93d00039cf49b92b4
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Fri Sep 4 10:42:55 2020 +0100
Fix conditionals for enabling QEMU sanity check
One part of the spec file checked %{kernel_arches} while the other
checked %{hostqemu}. In fact both conditions need to be valid in
order to be able to run the sanity check. Introduce an explicit
%{qemu_sanity_check} variable to express this rule.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index 46ff04c..9530011 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -79,6 +79,13 @@
%global hostqemu x86_64-softmmu/qemu-system-x86_64
%endif
+%global qemu_sanity_check 0
+%ifarch x %{?kernel_arches}
+%if 0%{?hostqemu:1}
+%global qemu_sanity_check 1
+%endif
+%endif
+
# All modules should be listed here.
%ifarch %{ix86} %{arm}
%define with_block_rbd 0
@@ -210,8 +217,7 @@ BuildRequires: gcc
BuildRequires: texinfo
# For /usr/bin/pod2man
BuildRequires: perl-podlators
-%ifarch %{kernel_arches}
-# For sanity test
+%if %{qemu_sanity_check}
BuildRequires: qemu-sanity-check-nodeps
BuildRequires: kernel
%endif
@@ -1402,7 +1408,7 @@ pushd build-dynamic
make check V=1
%endif
-%if 0%{?hostqemu:1}
+%if %{qemu_sanity_check}
# Sanity-check current kernel can boot on this qemu.
# The results are advisory only.
qemu-sanity-check --qemu=%{?hostqemu} ||:
@@ -1895,6 +1901,7 @@ getent passwd qemu >/dev/null || \
- Drop conditions for ppc, ppc64, mips64 and s390 arches
- Fix host qemu binary path for aarch64
- Re-enable kernel BR for QEMU sanity check
+- Fix conditionals for enabling QEMU sanity check
* Thu Sep 3 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-4
- Add btrfs ioctls to linux-user (rhbz #1872918)
commit 4e321e2f5cf77ed4387d86d41762848074cfaf8f
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Fri Sep 4 10:40:00 2020 +0100
Re-enable kernel BR for qemu sanity check
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index eda3911..46ff04c 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -213,8 +213,7 @@ BuildRequires: perl-podlators
%ifarch %{kernel_arches}
# For sanity test
BuildRequires: qemu-sanity-check-nodeps
-# 2020-08-12: Disable due to new f34 missing kernel package
-#BuildRequires: kernel
+BuildRequires: kernel
%endif
%if %{have_iasl}
# For acpi compilation
@@ -1895,6 +1894,7 @@ getent passwd qemu >/dev/null || \
* Fri Sep 4 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-5
- Drop conditions for ppc, ppc64, mips64 and s390 arches
- Fix host qemu binary path for aarch64
+- Re-enable kernel BR for QEMU sanity check
* Thu Sep 3 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-4
- Add btrfs ioctls to linux-user (rhbz #1872918)
commit 458e07e8d7d455559d8432b04e6c270e4053469b
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Fri Sep 4 10:38:10 2020 +0100
Fix host qemu binary path for aarch64
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index ac02483..eda3911 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -70,7 +70,7 @@
%global hostqemu arm-softmmu/qemu-system-arm
%endif
%ifarch aarch64
-%global hostqemu arm-softmmu/qemu-system-aarch64
+%global hostqemu aarch64-softmmu/qemu-system-aarch64
%endif
%ifarch %{ix86}
%global hostqemu i386-softmmu/qemu-system-i386
@@ -1894,6 +1894,7 @@ getent passwd qemu >/dev/null || \
%changelog
* Fri Sep 4 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-5
- Drop conditions for ppc, ppc64, mips64 and s390 arches
+- Fix host qemu binary path for aarch64
* Thu Sep 3 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-4
- Add btrfs ioctls to linux-user (rhbz #1872918)
commit 3c0f9e810a0b22b439681cedcba6073a20f13d88
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Fri Sep 4 10:04:15 2020 +0100
Drop references to obsolete arches
s390, ppc, ppc64 and mips64 are no longer valid Fedora primary
or alternative architectures.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index 6d5b368..ac02483 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -33,7 +33,7 @@
# Matches numactl ExcludeArch
%global have_numactl 1
-%ifarch s390 %{arm}
+%ifarch %{arm}
%global have_numactl 0
%endif
@@ -43,7 +43,7 @@
#
#
https://bugzilla.redhat.com/show_bug.cgi?id=1332449
%global have_iasl 1
-%ifnarch s390 s390x ppc ppc64
+%ifnarch s390x
%global have_iasl 0
%endif
@@ -170,7 +170,7 @@
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 5.1.0
-Release: 4%{?rcrel}%{?dist}
+Release: 5%{?rcrel}%{?dist}
Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY
URL:
http://www.qemu.org/
@@ -1002,14 +1002,8 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}"
scripts/qemu-trace-stap
# Disable LTO since it caused lots of strange assert failures.
%define _lto_cflags %{nil}
-# drop -g flag to prevent memory exhaustion by linker
-%ifarch s390
-%global optflags %(echo %{optflags} | sed 's/-g//')
-sed -i.debug 's/"-g $CFLAGS"/"$CFLAGS"/g' configure
-%endif
-
# OOM killer breaks builds with parallel make on s390(x)
-%ifarch s390 s390x
+%ifarch s390x
%global _smp_mflags %{nil}
%endif
@@ -1198,9 +1192,6 @@ run_configure \
--enable-modules \
--enable-mpath \
%{spiceflag} \
-%ifarch s390 %{mips64}
- --enable-tcg-interpreter \
-%endif
--enable-slirp=system
echo "config-host.mak contents:"
@@ -1399,13 +1390,6 @@ chmod +x %{buildroot}%{_libdir}/qemu/*.so
# Enable this temporarily if tests are broken
%global tests_nofail 0
-# Tests are hanging on s390 as of 2.3.0
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1206057
-# Tests seem to be a recurring problem on s390, leave them disabled.
-%ifarch s390
-%global tests_skip 1
-%endif
-
# 2020-08-31: tests passing, but s390x fails due to
# spurious warning breaking an iotest case
#
https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg03279.html
@@ -1908,6 +1892,9 @@ getent passwd qemu >/dev/null || \
%changelog
+* Fri Sep 4 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-5
+- Drop conditions for ppc, ppc64, mips64 and s390 arches
+
* Thu Sep 3 2020 Daniel P. Berrangé <berrange(a)redhat.com> - 5.1.0-4
- Add btrfs ioctls to linux-user (rhbz #1872918)