From e4599b5e276139f80db30824dedcc034db36b08c Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Jul 24 2019 18:25:25 +0000 Subject: Update to qemu-4.1.0-rc2 --- diff --git a/.gitignore b/.gitignore index 7db113e..cde0cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /qemu-4.0.0.tar.xz /qemu-4.1.0-rc0.tar.xz /qemu-4.1.0-rc1.tar.xz +/qemu-4.1.0-rc2.tar.xz diff --git a/0001-NOT-UPSTREAM-Build-fix-with-latest-kernel.patch b/0001-NOT-UPSTREAM-Build-fix-with-latest-kernel.patch deleted file mode 100644 index 3ae7186..0000000 --- a/0001-NOT-UPSTREAM-Build-fix-with-latest-kernel.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f92845e4c93da43feb52261916a6a979eff7bd0d Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Thu, 20 Jun 2019 17:20:13 -0400 -Subject: [PATCH] NOT UPSTREAM: Build fix with latest kernel - -From here: https://lkml.org/lkml/2019/6/3/988 - -Some attempts at patches have been posted, check qemu thread logs -for SIOCGSTAMP - -Signed-off-by: Cole Robinson ---- - linux-user/syscall.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 39a37496fe..830dc876ed 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/qemu.spec b/qemu.spec index b3e720a..41ab710 100644 --- a/qemu.spec +++ b/qemu.spec @@ -138,7 +138,7 @@ %{obsoletes_block_rbd} # Release candidate version tracking -%global rcver rc1 +%global rcver rc2 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} @@ -172,9 +172,6 @@ Source20: kvm-x86.modprobe.conf # /etc/security/limits.d/95-kvm-ppc64-memlock.conf Source21: 95-kvm-ppc64-memlock.conf -# Fix rawhide build (bz #1718926) -# Not upstream, some mailing list patches have been proposed -Patch0001: 0001-NOT-UPSTREAM-Build-fix-with-latest-kernel.patch # documentation deps BuildRequires: texinfo @@ -1073,7 +1070,7 @@ run_configure_disable_everything \ make V=1 %{?_smp_mflags} $buildldflags popd -%endif # user_static +%endif @@ -1166,7 +1163,7 @@ do done popd -%endif # user_static +%endif # Install main qemu-system-* tree @@ -1322,7 +1319,7 @@ make check V=1 || : qemu-sanity-check --qemu=%{?hostqemu} ||: %endif -%endif # archs_skip_tests +%endif popd @@ -1853,6 +1850,10 @@ getent passwd qemu >/dev/null || \ %changelog +* Wed Jul 17 2019 Cole Robinson - 2:4.1.0-0.1.rc2 +- Update to qemu-4.1.0-rc2 +- Re-add libattr for qemu-user-static (bz 1731756) + * Wed Jul 17 2019 Cole Robinson - 2:4.1.0-0.1.rc1 - Update to qemu-4.1.0-rc1 diff --git a/sources b/sources index dc01eb6..2446200 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-4.1.0-rc1.tar.xz) = 3857b392a668923820fb192f30ce32385cf8d6081e6d64b5937c6729af45a852b438622a4a83bbd7e270da906726b339bfeaed3074faa5ff14cfa3039750131f +SHA512 (qemu-4.1.0-rc2.tar.xz) = b73c4961a4324c0e6c39a93297e3736ca1f49f194329be6126b43d4ff3e96f993833507bcd817bb06d57f30be109273c0f65094fbc95a51d33ecf822f3467e6d