diff --git a/0001-Replace-nodefconfig-with-no-user-config.patch b/0001-Replace-nodefconfig-with-no-user-config.patch new file mode 100644 index 0000000..116f689 --- /dev/null +++ b/0001-Replace-nodefconfig-with-no-user-config.patch @@ -0,0 +1,11 @@ +--- 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/qemu-sanity-check.spec b/qemu-sanity-check.spec index a4cac25..e8d8551 100644 --- a/qemu-sanity-check.spec +++ b/qemu-sanity-check.spec @@ -13,6 +13,9 @@ License: GPLv2+ URL: http://people.redhat.com/~rjones/qemu-sanity-check Source0: http://people.redhat.com/~rjones/qemu-sanity-check/files/%{name}-%{version}.tar.gz +# 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 @@ -82,6 +85,7 @@ 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. @@ -127,7 +131,8 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog -* Sat Feb 02 2019 Fedora Release Engineering - 1.1.5-11 +* Sun Feb 03 2019 Richard W.M. Jones - 1.1.5-11 +- Add upstream patch to remove deprecated -nodefconfig option. - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Sat Jul 14 2018 Fedora Release Engineering - 1.1.5-10