From f83c44e4ad2fe604c66843add9e3a9b946fe8626 Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Tue, 23 Apr 2019 15:37:42 -0400 Subject: [PATCH] libvirt and qemu patch reduction Changes to support removing the RHEL patches include: - drop systemtap from the spec file for qemu - leave the man page name as qemu vs. qemu-kvm, man pages are not installed into containers anyway Change-Id: I230f7213f9de50fc94b4ddbbb0ebd6581ee1f5a1 Story: 2005212 Task: 29990 Depends-On: https://review.opendev.org/#/c/655235/ Signed-off-by: Jim Somerville --- virt/libvirt/centos/build_srpm.data | 2 +- virt/qemu/centos/build_srpm.data | 2 +- virt/qemu/centos/qemu-kvm.spec | 13 +++---------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/virt/libvirt/centos/build_srpm.data b/virt/libvirt/centos/build_srpm.data index ff5d0fb22..2e7e768d6 100644 --- a/virt/libvirt/centos/build_srpm.data +++ b/virt/libvirt/centos/build_srpm.data @@ -5,5 +5,5 @@ COPY_LIST="\ $CGCS_BASE/downloads/gnulib-ffc927e.tar.gz \ $CGCS_BASE/downloads/keycodemapdb-16e5b07.tar.gz" TIS_BASE_SRCREV=ab58260efaa712650c63bb1917122f270070fa4b -TIS_PATCH_VER=GITREVCOUNT +TIS_PATCH_VER=100 BUILD_IS_SLOW=4 diff --git a/virt/qemu/centos/build_srpm.data b/virt/qemu/centos/build_srpm.data index 27a85e5e6..ada702e33 100644 --- a/virt/qemu/centos/build_srpm.data +++ b/virt/qemu/centos/build_srpm.data @@ -6,5 +6,5 @@ COPY_LIST="$CGCS_BASE/downloads/kvm-unit-tests.git-4ea7633.tar.bz2 \ $PKG_BASE/qemu/qemu_clean.service \ $PKG_BASE/qemu/qemu-system-x86.conf" TIS_BASE_SRCREV=38441756b70eec5807b5f60dad11a93a91199866 -TIS_PATCH_VER=GITREVCOUNT +TIS_PATCH_VER=100 diff --git a/virt/qemu/centos/qemu-kvm.spec b/virt/qemu/centos/qemu-kvm.spec index b93d34372..717b814df 100644 --- a/virt/qemu/centos/qemu-kvm.spec +++ b/virt/qemu/centos/qemu-kvm.spec @@ -570,7 +570,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/qemu-system-%{kvm_target} # install -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/tracetool/format scripts/tracetool/format/*.py mkdir -p $RPM_BUILD_ROOT%{qemudocdir} -install -p -m 0644 -t ${RPM_BUILD_ROOT}%{qemudocdir} Changelog README README.systemtap COPYING COPYING.LIB LICENSE %{SOURCE19} docs/interop/qmp-spec.txt +install -p -m 0644 -t ${RPM_BUILD_ROOT}%{qemudocdir} Changelog README COPYING COPYING.LIB LICENSE %{SOURCE19} docs/interop/qmp-spec.txt mv ${RPM_BUILD_ROOT}%{_docdir}/qemu/qemu-doc.html $RPM_BUILD_ROOT%{qemudocdir} mv ${RPM_BUILD_ROOT}%{_docdir}/qemu/qemu-doc.txt $RPM_BUILD_ROOT%{qemudocdir} mv ${RPM_BUILD_ROOT}%{_docdir}/qemu/qemu-qmp-ref.html $RPM_BUILD_ROOT%{qemudocdir} @@ -751,13 +751,7 @@ exit 0 %{_udevdir}/80-kvm.rules %global qemu_kvm_files \ -%{_libexecdir}/qemu-kvm \ -%{_datadir}/%{pkgname}/systemtap/conf.d/qemu_kvm.conf \ -%{_datadir}/%{pkgname}/systemtap/script.d/qemu_kvm.stp - -# WRS: Disable traces -# %{_datadir}/systemtap/tapset/qemu-kvm.stp -# %{_datadir}/systemtap/tapset/qemu-kvm-simpletrace.stp +%{_libexecdir}/qemu-kvm %files -n qemu-kvm-common%{?pkgsuffix} %defattr(-,root,root) @@ -770,14 +764,13 @@ exit 0 %doc %{qemudocdir}/COPYING.LIB %doc %{qemudocdir}/LICENSE %doc %{qemudocdir}/README.rhel6-gpxe-source -%doc %{qemudocdir}/README.systemtap %doc %{qemudocdir}/qmp-spec.txt %doc %{qemudocdir}/qemu-qmp-ref.html %doc %{qemudocdir}/qemu-qmp-ref.txt %dir %{_datadir}/%{pkgname}/ %{_datadir}/%{pkgname}/keymaps/ -%{_mandir}/man1/%{pkgname}.1* +%{_mandir}/man1/qemu.1* %{_mandir}/man7/qemu-qmp-ref* %attr(4755, -, -) %{_libexecdir}/qemu-bridge-helper %config(noreplace) %{_sysconfdir}/sasl2/%{pkgname}.conf