Accepting request 630954 from Virtualization:Staging

Update to v3.0.0 version

OBS-URL: https://build.opensuse.org/request/show/630954
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=424
This commit is contained in:
Bruce Rogers
2018-08-22 14:58:18 +00:00
committed by Git OBS Bridge
parent b8088a06f4
commit f5964530cc
62 changed files with 1078 additions and 1880 deletions

View File

@@ -111,24 +111,22 @@ License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.12.1.tar.xz
Source99: http://wiki.qemu.org/download/qemu-2.12.1.tar.xz.sig
Source: http://wiki.qemu.org/download/qemu-3.0.0.tar.xz
Source99: http://wiki.qemu.org/download/qemu-3.0.0.tar.xz.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
Source4: kvm_stat.1.gz
Source2: 71-sev.rules
Source3: qemu-ifup
Source4: bridge.conf
Source5: qemu-kvm.1.gz
Source6: ksm.service
Source7: qemu-ga@.service
Source8: 80-qemu-ga.rules
Source9: qemu-supportconfig
Source10: kvm.conf
Source11: bridge.conf
Source11: supported.ppc.txt
Source12: supported.x86.txt
Source13: supported.s390.txt
Source14: supported.arm.txt
Source15: supported.ppc.txt
Source16: 71-sev.rules
# Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
PATCH_FILES
@@ -137,7 +135,6 @@ PATCH_FILES
# If for any reason we have base QEMU patches which are conditionally applied,
# include them here
Patch1000: Make-installed-scripts-explicitly-python3.patch
# SeaBIOS / SeaVGABIOS
Patch1100: seabios-use-python2-explicitly-as-needed.patch
@@ -340,11 +337,7 @@ Requires(post): udev
%ifarch s390x
Requires(post): procps
%endif
%if 0%{?suse_version} > 1320
Recommends: kvm_stat
%else
Recommends: python-curses
%endif
%endif
Recommends: qemu-block-curl
Recommends: qemu-tools
@@ -801,13 +794,9 @@ This package provides a service file for starting and stopping KSM.
%endif # !qemu-testsuite
%prep
%setup -q -n qemu-2.12.1
%setup -q -n qemu-3.0.0
PATCH_EXEC
%if 0%{?suse_version} > 1320
%patch1000 -p1
%endif
pushd roms/seabios
%patch1100 -p1
%if 0%{?suse_version} > 1320
@@ -1127,10 +1116,7 @@ export QEMU_PROG=%{_bindir}/qemu-system-x86_64
export QEMU_IMG_PROG=%{_bindir}/qemu-img
export QEMU_IO_PROG=%{_bindir}/qemu-io
export QEMU_NBD_PROG=%{_bindir}/qemu-nbd
# the block tests are not yet 32 bit x86 friendly
%ifnarch %ix86
make check-block V=1
%endif
# Create minimal gzip format file
echo "Test" > test.txt
@@ -1159,18 +1145,18 @@ for f in %{x86_extra_built_firmware_list} \
done
%endif
%find_lang %name
install -D -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
install -D -m 0755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
install -D -m 0755 %{SOURCE3} %{buildroot}/usr/share/qemu/qemu-ifup
install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
install -D -m 0755 scripts/analyze-migration.py %{buildroot}%{_bindir}/analyze-migration.py
install -D -m 0755 scripts/vmstate-static-checker.py %{buildroot}%{_bindir}/vmstate-static-checker.py
mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
install -D -m 0755 %{SOURCE9} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
%if 0%{?is_opensuse} == 0
install -D -m 0644 %{SOURCE11} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
install -D -m 0644 %{SOURCE12} %{buildroot}%{_docdir}/qemu-x86/supported.txt
install -D -m 0644 %{SOURCE13} %{buildroot}%{_docdir}/qemu-s390/supported.txt
install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt
install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
%endif
%if %{legacy_qemu_kvm}
cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
@@ -1194,12 +1180,8 @@ ln -s ../qemu-x86/supported.txt %{buildroot}%{_docdir}/qemu-kvm/kvm-supported.tx
%endif
%endif
%if %{kvm_available}
%if 0%{?suse_version} <= 1320
install -D -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat
install -D -m 0644 %{SOURCE4} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
%endif
%ifarch %ix86 x86_64
install -D -m 0644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/71-sev.rules
install -D -m 0644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/71-sev.rules
%endif
install -D -m 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
%endif
@@ -1296,7 +1278,7 @@ fi
%defattr(-, root, root)
%if "%{name}" != "qemu-testsuite"
%doc Changelog README VERSION
%license COPYING COPYING.LIB COPYING.PYTHON LICENSE
%license COPYING COPYING.LIB LICENSE
%_docdir/%name/qemu-doc.txt
%_docdir/%name/qemu-doc.html
%_docdir/%name/qemu-qmp-ref.txt
@@ -1318,10 +1300,6 @@ fi
%dir %_libexecdir/supportconfig/plugins
%_libexecdir/supportconfig/plugins/qemu
%if %{kvm_available}
%if 0%{?suse_version} <= 1320
%_bindir/kvm_stat
%doc %_mandir/man1/kvm_stat.1.gz
%endif
%ifarch %ix86 x86_64
%{_udevrulesdir}/71-sev.rules
%endif