The package rpms/qemu-sanity-check.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-sanity-check.git/commit/?id=b32... https://src.fedoraproject.org/cgit/rpms/qemu-sanity-check.git/commit/?id=b27....
Change: +%ifarch %{test_arches} +ExclusiveArch: %{kernel_arches}
Thanks.
Full change: ============
commit b32f9efe8c3c8f59a4a21fea0fe9ee9c27e8ab5d Author: Richard W.M. Jones rjones@redhat.com Date: Thu Sep 10 14:55:14 2020 +0100
New upstream version 1.1.6. Remove all patches. Run the tests on some more arches. Require qemu-system-<arch>. Enable hardened build. Enable signed tarball.
diff --git a/.gitignore b/.gitignore index c4bb6df..8f5dac1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@
/clog /qemu-sanity-check-*.tar.gz +/qemu-sanity-check-*.tar.gz.sig diff --git a/0001-Replace-nodefconfig-with-no-user-config.patch b/0001-Replace-nodefconfig-with-no-user-config.patch deleted file mode 100644 index 116f689..0000000 --- a/0001-Replace-nodefconfig-with-no-user-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qemu-sanity-check-1.1.5.old/qemu-sanity-check.in 2014-07-02 19:10:50.000000000 +0100 -+++ qemu-sanity-check-1.1.5/qemu-sanity-check.in 2019-02-03 11:50:42.843269577 +0000 -@@ -141,7 +141,7 @@ - i=0 - argv[$((i++))]="$qemu" - argv[$((i++))]="-nographic" --argv[$((i++))]="-nodefconfig" -+argv[$((i++))]="-no-user-config" - argv[$((i++))]="-nodefaults" - argv[$((i++))]="-machine" - argv[$((i++))]="accel=$accel" diff --git a/0004-Disable-bad-userspace-test-Fedora-only.patch b/0004-Disable-bad-userspace-test-Fedora-only.patch deleted file mode 100644 index 7f19fbf..0000000 --- a/0004-Disable-bad-userspace-test-Fedora-only.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 67b7df2b0076148448916ad70ca9d35fb4a5c669 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" rjones@redhat.com -Date: Thu, 22 Aug 2013 16:42:00 +0100 -Subject: [PATCH 4/4] Disable bad userspace test (Fedora only). - ---- - Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 5f22f79..ec549d4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -67,8 +67,8 @@ TESTS = \ - test-timeout \ - test-bad-options \ - test-bad-kernel \ -- test-bad-qemu \ -- test-bad-userspace -+ test-bad-qemu -+# test-bad-userspace - - # Tag HEAD with current version (maintainer only). - --- -1.8.3.1 - diff --git a/libguestfs.keyring b/libguestfs.keyring new file mode 100644 index 0000000..bb3eb55 Binary files /dev/null and b/libguestfs.keyring differ diff --git a/qemu-sanity-check.spec b/qemu-sanity-check.spec index 53cd7a6..2978393 100644 --- a/qemu-sanity-check.spec +++ b/qemu-sanity-check.spec @@ -1,12 +1,19 @@ -# _hardened_build breaks building the static 'init' binary. -# https://bugzilla.redhat.com/1204162 -%undefine _hardened_build - %global debug_package %{nil}
+# Architectures where the tests should pass. +# +# 2020-09: Fails on power64 because qemu TCG does not support all the +# features required to boot Fedora. +# +# 2020-09: armv7 failed with: +# ./qemu-sanity-check: cannot find a Linux kernel in /boot +# +# 2020-09: aarch64 hangs. +%global test_arches %{s390x} x86_64 + Name: qemu-sanity-check -Version: 1.1.5 -Release: 16%{?dist} +Version: 1.1.6 +Release: 1%{?dist} Summary: Simple qemu and Linux kernel sanity checker License: GPLv2+
@@ -14,16 +21,12 @@ ExclusiveArch: %{kernel_arches}
URL: http://people.redhat.com/~rjones/qemu-sanity-check Source0: http://people.redhat.com/~rjones/qemu-sanity-check/files/%%7Bname%7D-%%7Bver... +Source1: http://people.redhat.com/~rjones/qemu-sanity-check/files/%%7Bname%7D-%%7Bver... +# Keyring used to verify tarball signature. +Source2: libguestfs.keyring
-# Upstream patch to remove deprecated -nodefconfig option. -Patch1: 0001-Replace-nodefconfig-with-no-user-config.patch - -# Non-upstream patch to disable test which fails on broken kernels -# which don't respond to panic=1 option properly. -Patch4: 0004-Disable-bad-userspace-test-Fedora-only.patch - -# Because the above patch touches configure.ac/Makefile.am: -BuildRequires: autoconf, automake +# To verify the tarball signature. +BuildRequires: gnupg2
BuildRequires: gcc
@@ -34,26 +37,35 @@ BuildRequires: /usr/bin/perldoc BuildRequires: cpio BuildRequires: glibc-static
-# BuildRequire these in order to let 'make check' run. These are -# not required unless you want to run the tests. Note don't run the -# tests on ARM since qemu isn't likely to work. -%ifarch %{ix86} x86_64 -BuildRequires: qemu-system-x86 -%endif - +# For testing. +BuildRequires: qemu BuildRequires: kernel
# For complicated reasons, this is required so that # /bin/kernel-install puts the kernel directly into /boot, instead of # into a /boot/<machine-id> subdirectory (in Fedora >= 23). Read the # kernel-install script to understand why. -BuildRequires: grubby +BuildRequires: grubby
%ifarch %{ix86} x86_64 Requires: qemu-system-x86 +%global qemu %{_bindir}/qemu-system-x86_64 %endif %ifarch armv7hl Requires: qemu-system-arm +%global qemu %{_bindir}/qemu-system-arm +%endif +%ifarch aarch64 +Requires: qemu-system-aarch64 +%global qemu %{_bindir}/qemu-system-aarch64 +%endif +%ifarch %{power64} +Requires: qemu-system-ppc +%global qemu %{_bindir}/qemu-system-ppc64 +%endif +%ifarch %{s390x} +Requires: qemu-system-s390x +%global qemu %{_bindir}/qemu-system-s390x %endif
Requires: kernel @@ -85,19 +97,20 @@ as %{name} except that this package does not depend on qemu or kernel.
%prep -%setup -q - -%patch1 -p1 -%patch4 -p1 - -# Rerun autotools because the patches touch configure.ac and Makefile.am. -autoreconf -i +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup -p1
%build # NB: canonical_arch is a variable in the final script, so it # has to be escaped here. -%configure --with-qemu-list="qemu-system-$canonical_arch" || { +%configure \ +%if 0%{?qemu:1} + --with-qemu-list="%{qemu}" \ +%else + --with-qemu-list="qemu-system-$canonical_arch" \ +%endif +|| { cat config.log exit 1 } @@ -105,16 +118,12 @@ make %{?_smp_mflags}
%check -# Temporarily disable x86 because kernel is broken there -# (https://bugzilla.redhat.com/show_bug.cgi?id=1302071) -%ifnarch %{ix86} -%ifarch %{ix86} x86_64 +%ifarch %{test_arches} make check || { cat test-suite.log exit 1 } %endif -%endif
%install @@ -133,6 +142,14 @@ make DESTDIR=$RPM_BUILD_ROOT install
%changelog +* Thu Sep 10 2020 Richard W.M. Jones rjones@redhat.com - 1.1.6-1 +- New upstream version 1.1.6. +- Remove all patches. +- Run the tests on some more arches. +- Require qemu-system-<arch>. +- Enable hardened build. +- Enable signed tarball. + * Wed Aug 19 2020 Merlin Mathesius mmathesi@redhat.com - 1.1.5-16 - Use ExclusiveArch: %%{kernel_arches}
diff --git a/sources b/sources index 1fab55d..746f6b2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -cceb7bb200adee4136e25b77e3c12cb0 qemu-sanity-check-1.1.5.tar.gz +SHA512 (qemu-sanity-check-1.1.6.tar.gz) = 39f47822b34d661da826e60db74a3d8fe90e805b60d74f4ecbec5d894d8bf671f4e4a7f05b776ce47b8d1f789fe18b8f058fa4a312568efcbea2948170f501f9 +SHA512 (qemu-sanity-check-1.1.6.tar.gz.sig) = 97f348a58064562cd793b2c8ddacec6790b35c462329114df6f7cc27075c48d8daa4486330454809022c5103822e4fea7cef03d4225a3779d39cefd96742bb95
commit b279399baa181dd1f8cb088f3b3477efaaf647bc Author: Merlin Mathesius mmathesi@redhat.com Date: Wed Aug 19 15:16:47 2020 -0500
Use ExclusiveArch: %{kernel_arches}
Signed-off-by: Merlin Mathesius mmathesi@redhat.com
diff --git a/qemu-sanity-check.spec b/qemu-sanity-check.spec index 9201017..53cd7a6 100644 --- a/qemu-sanity-check.spec +++ b/qemu-sanity-check.spec @@ -10,8 +10,7 @@ Release: 16%{?dist} Summary: Simple qemu and Linux kernel sanity checker License: GPLv2+
-# https://bugzilla.redhat.com/show_bug.cgi?id=1733606 -ExcludeArch: i686 +ExclusiveArch: %{kernel_arches}
URL: http://people.redhat.com/~rjones/qemu-sanity-check Source0: http://people.redhat.com/~rjones/qemu-sanity-check/files/%%7Bname%7D-%%7Bver... @@ -134,6 +133,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
%changelog +* Wed Aug 19 2020 Merlin Mathesius mmathesi@redhat.com - 1.1.5-16 +- Use ExclusiveArch: %%{kernel_arches} + * Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 1.1.5-16 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
arch-excludes@lists.fedoraproject.org