Rebase to qemu-3.1.0-rc1

This commit is contained in:
Cole Robinson 2018-11-15 19:50:28 -05:00
parent e4323bc8b2
commit 007776f3e4
3 changed files with 17 additions and 8 deletions

1
.gitignore vendored
View File

@ -24,3 +24,4 @@
/qemu-2.12.0.tar.xz /qemu-2.12.0.tar.xz
/qemu-3.0.0-rc3.tar.xz /qemu-3.0.0-rc3.tar.xz
/qemu-3.0.0.tar.xz /qemu-3.0.0.tar.xz
/qemu-3.1.0-rc1.tar.xz

View File

@ -95,7 +95,7 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
# Release candidate version tracking # Release candidate version tracking
#global rcver rc3 %global rcver rc1
%if 0%{?rcver:1} %if 0%{?rcver:1}
%global rcrel .%{rcver} %global rcrel .%{rcver}
%global rcstr -%{rcver} %global rcstr -%{rcver}
@ -104,8 +104,8 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
Summary: QEMU is a FAST! processor emulator Summary: QEMU is a FAST! processor emulator
Name: qemu Name: qemu
Version: 3.0.0 Version: 3.1.0
Release: 1%{?rcrel}%{?dist} Release: 0.1%{?rcrel}%{?dist}
Epoch: 2 Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY License: GPLv2 and BSD and MIT and CC-BY
URL: http://www.qemu.org/ URL: http://www.qemu.org/
@ -246,6 +246,10 @@ BuildRequires: capstone-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
# python scripts in the build process # python scripts in the build process
BuildRequires: python3 BuildRequires: python3
# qemu 3.1: Used for nvdimm
BuildRequires: libpmem-devel
# qemu 3.1: Used for qemu-ga
BuildRequires: libudev-devel
BuildRequires: glibc-static pcre-static glib2-static zlib-static BuildRequires: glibc-static pcre-static glib2-static zlib-static
@ -882,7 +886,6 @@ run_configure \
--enable-mpath \ --enable-mpath \
%{spiceflag} \ %{spiceflag} \
--with-sdlabi="2.0" \ --with-sdlabi="2.0" \
--with-gtkabi="3.0"
echo "config-host.mak contents:" echo "config-host.mak contents:"
echo "===" echo "==="
@ -917,7 +920,9 @@ run_configure \
--disable-brlapi \ --disable-brlapi \
--disable-mpath \ --disable-mpath \
--disable-libnfs \ --disable-libnfs \
--disable-capstone --disable-capstone \
--disable-xen \
--disable-rdma
make V=1 %{?_smp_mflags} $buildldflags make V=1 %{?_smp_mflags} $buildldflags
@ -1197,9 +1202,11 @@ getent passwd qemu >/dev/null || \
%{_mandir}/man1/qemu.1* %{_mandir}/man1/qemu.1*
%{_mandir}/man1/virtfs-proxy-helper.1* %{_mandir}/man1/virtfs-proxy-helper.1*
%{_mandir}/man7/qemu-block-drivers.7* %{_mandir}/man7/qemu-block-drivers.7*
%{_mandir}/man7/qemu-cpu-models.7*
%{_mandir}/man7/qemu-ga-ref.7* %{_mandir}/man7/qemu-ga-ref.7*
%{_mandir}/man7/qemu-qmp-ref.7* %{_mandir}/man7/qemu-qmp-ref.7*
%{_bindir}/virtfs-proxy-helper %{_bindir}/virtfs-proxy-helper
%{_bindir}/qemu-edid
%{_bindir}/qemu-keymap %{_bindir}/qemu-keymap
%{_bindir}/qemu-pr-helper %{_bindir}/qemu-pr-helper
%{_unitdir}/qemu-pr-helper.service %{_unitdir}/qemu-pr-helper.service
@ -1497,11 +1504,9 @@ getent passwd qemu >/dev/null || \
%files system-ppc-core %files system-ppc-core
%{_bindir}/qemu-system-ppc %{_bindir}/qemu-system-ppc
%{_bindir}/qemu-system-ppc64 %{_bindir}/qemu-system-ppc64
%{_bindir}/qemu-system-ppcemb
%{_datadir}/systemtap/tapset/qemu-system-ppc*.stp %{_datadir}/systemtap/tapset/qemu-system-ppc*.stp
%{_mandir}/man1/qemu-system-ppc.1* %{_mandir}/man1/qemu-system-ppc.1*
%{_mandir}/man1/qemu-system-ppc64.1* %{_mandir}/man1/qemu-system-ppc64.1*
%{_mandir}/man1/qemu-system-ppcemb.1*
%{_datadir}/%{name}/bamboo.dtb %{_datadir}/%{name}/bamboo.dtb
%{_datadir}/%{name}/canyonlands.dtb %{_datadir}/%{name}/canyonlands.dtb
%{_datadir}/%{name}/ppc_rom.bin %{_datadir}/%{name}/ppc_rom.bin
@ -1598,6 +1603,9 @@ getent passwd qemu >/dev/null || \
%changelog %changelog
* Thu Nov 15 2018 Cole Robinson <crobinso@redhat.com> - 2:3.1.0-0.1.rc1
- Rebase to qemu-3.1.0-rc1
* Wed Aug 15 2018 Cole Robinson <crobinso@redhat.com> - 2:3.0.0-1 * Wed Aug 15 2018 Cole Robinson <crobinso@redhat.com> - 2:3.0.0-1
- Rebase to qemu-3.0.0 GA - Rebase to qemu-3.0.0 GA

View File

@ -1 +1 @@
SHA512 (qemu-3.0.0.tar.xz) = a764302f50b9aca4134bbbc1f361b98e71240cdc7b25600dfe733bf4cf17bd86000bd28357697b08f3b656899dceb9e459350b8d55557817444ed5d7fa380a5a SHA512 (qemu-3.1.0-rc1.tar.xz) = 20f4e8516419c308025bb349a2abb9b8ce43d9ce5220c2c1d949c26c4de91fbbe0cc713f632e1baec4cc99307bbbeb8aa4296b52321e3d39faa3731d904bf897