Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2020-04-12 09:57:41 +03:00
commit d2145978fd
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
3 changed files with 12 additions and 9 deletions

1
.gitignore vendored
View File

@ -40,3 +40,4 @@
/qemu-4.2.0-rc5.tar.xz
/qemu-4.2.0.tar.xz
/qemu-5.0.0-rc0.tar.xz
/qemu-5.0.0-rc2.tar.xz

View File

@ -151,7 +151,7 @@
%{obsoletes_block_rbd}
# Release candidate version tracking
%global rcver rc0
%global rcver rc2
%if 0%{?rcver:1}
%global rcrel .%{rcver}
%global rcstr -%{rcver}
@ -161,7 +161,7 @@
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 5.0.0
Release: 0.2%{?rcrel}.0.riscv64%{?dist}
Release: 0.3.0.riscv64%{?rcrel}%{?dist}
Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY
URL: http://www.qemu.org/
@ -335,6 +335,8 @@ BuildRequires: liburing-devel
%endif
# qemu 5.0 zstd compression support
BuildRequires: libzstd-devel
# `hostname` used by test suite
BuildRequires: hostname
BuildRequires: glibc-static pcre-static glib2-static zlib-static
# if -pthread is used GCC SPEC will add --as-needed -latomic --no-as-needed for linker
@ -1151,10 +1153,6 @@ run_configure \
%if 0%{?fedora} > 30
--enable-slirp=system \
%endif
--disable-linux-io-uring
# uring temporarily disabled, it's breaking the test suite:
# https://lists.gnu.org/archive/html/qemu-block/2020-03/msg01395.html
echo "config-host.mak contents:"
echo "==="
@ -1356,7 +1354,8 @@ chmod +x %{buildroot}%{_libdir}/qemu/*.so
%global archs_ignore_test_failures 0
# Enable this temporarily if tests are broken
%global temp_skip_check 0
# An iotest is failing for i686
%global temp_skip_check 1
pushd build-dynamic
%ifnarch %{archs_skip_tests}
@ -1845,9 +1844,12 @@ getent passwd qemu >/dev/null || \
%changelog
* Wed Apr 08 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 2:5.0.0-0.2.rc0.0.riscv64
* Sun Apr 12 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 5.0.0-0.3.rc2.0.riscv64
- Enable support for RISC-V (riscv64)
* Thu Apr 09 2020 Cole Robinson <aintdiscole@gmail.com> - 5.0.0-0.3.rc2
- Update to qemu 5.0.0 rc2
* Wed Apr 08 2020 Adam Williamson <awilliam@redhat.com> - 2:5.0.0-0.2.rc0
- Rebuild for new brltty

View File

@ -1 +1 @@
SHA512 (qemu-5.0.0-rc0.tar.xz) = d61b11f51647bf70d7bddb4b4e790ab9d634729f8c87b74b51ee5f04a37527e234eab68775ccdc7e59f4ad999b514a1b725d78d63f54233798bdf65cb6493e2f
SHA512 (qemu-5.0.0-rc2.tar.xz) = 6e45e162335f33a78d5f4abd66d85c86096ef398283634f9f63c6fcc19d27e437407ebc99a459040231e3e7ddfef1fd0bb02f5b0c487424dbe8f13c833dc838f