rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

- Update requirements for kvm package. Instead of calling qemu-kvm

Browse Source 
and Requires: kvm, replace the Requires with /usr/bin/qemu-system-$ARCH
  Define the helper for aarch64, ppc64, s390x and x86_64.
  Other archs have to use LIBGUESTFS_HV= (bnc#884564)

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=298
This commit is contained in:
Olaf Hering 2014-07-07 08:21:47 +00:00 committed by Git OBS Bridge
parent e02e9f1d48
commit 426301008d
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libguestfs.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 7 10:12:36 CEST 2014 - ohering@suse.de
- Update requirements for kvm package. Instead of calling qemu-kvm
and Requires: kvm, replace the Requires with /usr/bin/qemu-system-$ARCH
Define the helper for aarch64, ppc64, s390x and x86_64.
Other archs have to use LIBGUESTFS_HV= (bnc#884564)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 7 09:37:23 CEST 2014 - ohering@suse.de Mon Jul 7 09:37:23 CEST 2014 - ohering@suse.de

19
libguestfs.spec
View File

@ -95,6 +95,21 @@ Release: 0
%define kernel_binary /boot/uImage %define kernel_binary /boot/uImage
%endif %endif
# #
# use 'env LIBGUESTFS_HV=/path/to/kvm libguestfs-test-tool' to verify
%define kvm_binary /bin/false
%ifarch aarch64
%define kvm_binary /usr/bin/qemu-system-aarch64
%endif
%ifarch ppc64
%define kvm_binary /usr/bin/qemu-system-ppc64
%endif
%ifarch s390x
%define kvm_binary /usr/bin/qemu-system-s390x
%endif
%ifarch x86_64
%define kvm_binary /usr/bin/qemu-system-x86_64
%endif
#
%define guestfs_docdir %{_defaultdocdir}/%{name} %define guestfs_docdir %{_defaultdocdir}/%{name}
# #
Name: libguestfs Name: libguestfs
@ -207,7 +222,7 @@ License: GPL-2.0
Group: System/Filesystems Group: System/Filesystems
Provides: %{name} = %{version} Provides: %{name} = %{version}
Obsoletes: %{name} < %{version} Obsoletes: %{name} < %{version}
Requires: kvm >= 1.1 Requires: %{kvm_binary}
%if %{with bash_completion} %if %{with bash_completion}
Recommends: bash-completion >= 2.0 Recommends: bash-completion >= 2.0
%endif %endif
@ -493,7 +508,7 @@ export PERLLIB=`echo $PWD/Pod-Simple-*/lib`
# With QEMU in environment qemu and kvm packages are not needed at build time. # With QEMU in environment qemu and kvm packages are not needed at build time.
# With SUPERMIN and SUPERMIN_HELPER in environment, supermin package is not needed at build time. # With SUPERMIN and SUPERMIN_HELPER in environment, supermin package is not needed at build time.
export vmchannel_test=no export vmchannel_test=no
export QEMU=/usr/bin/qemu-kvm export QEMU="%{kvm_binary}"
export SUPERMIN=supermin export SUPERMIN=supermin
export SUPERMIN_HELPER=supermin-helper export SUPERMIN_HELPER=supermin-helper
# for configure macro below # for configure macro below