rpms/qemu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spec: Drop now unused kvm_target and kvm_archs globals

Browse Source
This commit is contained in:
Cole Robinson 2015-06-05 18:21:57 -04:00
parent 7bf3158612
commit d43799b0b3
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qemu.spec
View File

@ -1,32 +1,29 @@
%global kvm_archs %{ix86} x86_64 ppc64 ppc64le s390x armv7hl aarch64
%ifarch %{ix86} %ifarch %{ix86}
%global kvm_package system-x86 %global kvm_package system-x86
%global kvm_target i386
# need_qemu_kvm should only ever be used by x86 # need_qemu_kvm should only ever be used by x86
%global need_qemu_kvm 1 %global need_qemu_kvm 1
%endif %endif
%ifarch x86_64 %ifarch x86_64
%global kvm_package system-x86 %global kvm_package system-x86
%global kvm_target x86_64
# need_qemu_kvm should only ever be used by x86 # need_qemu_kvm should only ever be used by x86
%global need_qemu_kvm 1 %global need_qemu_kvm 1
%endif %endif
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
%global kvm_package system-ppc %global kvm_package system-ppc
%global kvm_target ppc64
%endif %endif
%ifarch s390x %ifarch s390x
%global kvm_package system-s390x %global kvm_package system-s390x
%global kvm_target s390x
%endif %endif
%ifarch armv7hl %ifarch armv7hl
%global kvm_package system-arm %global kvm_package system-arm
%global kvm_target arm
%endif %endif
%ifarch aarch64 %ifarch aarch64
%global kvm_package system-aarch64 %global kvm_package system-aarch64
%global kvm_target aarch64 %endif
%global have_kvm 0
%if 0%{?kvm_package:1}
%global have_kvm 1
%endif %endif
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
@ -200,7 +197,7 @@ emulation speed by using dynamic translation. QEMU has two operating modes:
As QEMU requires no host kernel patches to run, it is safe and easy to use. As QEMU requires no host kernel patches to run, it is safe and easy to use.
%ifarch %{kvm_archs} %if %{have_kvm}
%package kvm %package kvm
Summary: QEMU metapackage for KVM support Summary: QEMU metapackage for KVM support
Group: Development/Tools Group: Development/Tools
@ -506,7 +503,7 @@ emulation speed by using dynamic translation.
This package provides the system emulator for Tricore. This package provides the system emulator for Tricore.
%ifarch %{kvm_archs} %if %{have_kvm}
%package kvm-tools %package kvm-tools
Summary: KVM debugging and diagnostics tools Summary: KVM debugging and diagnostics tools
Group: Development/Tools Group: Development/Tools
@ -661,7 +658,7 @@ install -m 0644 %{_sourcedir}/qemu-guest-agent.service %{buildroot}%{_unitdir}
install -m 0644 %{_sourcedir}/99-qemu-guest-agent.rules %{buildroot}%{_udevdir} install -m 0644 %{_sourcedir}/99-qemu-guest-agent.rules %{buildroot}%{_udevdir}
# Install kvm specific bits # Install kvm specific bits
%ifarch %{kvm_archs} %if %{have_kvm}
mkdir -p %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_bindir}/
install -m 0755 scripts/kvm/kvm_stat %{buildroot}%{_bindir}/ install -m 0755 scripts/kvm/kvm_stat %{buildroot}%{_bindir}/
install -m 0644 %{_sourcedir}/80-kvm.rules %{buildroot}%{_udevdir} install -m 0644 %{_sourcedir}/80-kvm.rules %{buildroot}%{_udevdir}
@ -838,7 +835,7 @@ if test -f "$hostqemu"; then qemu-sanity-check --qemu=$hostqemu ||: ; fi
%endif # archs_skip_tests %endif # archs_skip_tests
%ifarch %{kvm_archs} %if %{have_kvm}
%post %{kvm_package} %post %{kvm_package}
# Default /dev/kvm permissions are 660, we install a udev rule changing that # Default /dev/kvm permissions are 660, we install a udev rule changing that
# to 666. However trying to trigger the re-permissioning via udev has been # to 666. However trying to trigger the re-permissioning via udev has been
@ -884,7 +881,7 @@ getent passwd qemu >/dev/null || \
%files %files
%ifarch %{kvm_archs} %if %{have_kvm}
%files kvm %files kvm
%endif %endif
@ -1017,7 +1014,7 @@ getent passwd qemu >/dev/null || \
%endif %endif
%ifarch %{kvm_archs} %if %{have_kvm}
%files kvm-tools %files kvm-tools
%{_bindir}/kvm_stat %{_bindir}/kvm_stat
%endif %endif