[packages/libguestfs] try to guess real qemu binary

atler atler at pld-linux.org
Mon Aug 14 20:13:26 CEST 2017


commit b2308e25b1a01dd890e37205e65fd70b6936e906
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Aug 14 18:45:07 2017 +0200

    try to guess real qemu binary

 libguestfs.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 9897db6..add6c27 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -164,6 +164,13 @@ Suggests:	icoutils
 Suggests:	netpbm-progs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch %{ix86}
+%define		qemu_bin	/usr/bin/qemu-system-i386
+%endif
+%ifarch %{x8664} x32
+%define		qemu_bin	/usr/bin/qemu-system-x86_64
+%endif
+
 %description
 libguestfs is a library and set of tools for accessing and modifying
 virtual machine (VM) disk images. You can use this for viewing and
@@ -462,13 +469,12 @@ Bashowe uzupełnianie argumentów dla narzędzi libguestfs.
 	SUPERMIN=/usr/bin/supermin \
 	UNZIP=/usr/bin/unzip \
 	WRESTOOL=/usr/bin/wrestool \
-	QEMU=%{_bindir}/qemu \
+	QEMU=%{?qemu_bin}%{!?qemu_bin:/usr/bin/qemu} \
 	ZIP=/usr/bin/zip \
 	--with-completionsdir=%{_datadir}/bash-completion/completions \
 	--with-html-dir=%{_gtkdocdir} \
 	--with-java=%{?with_java:%{java_home}}%{!?with_java:no} \
 	--with-python-installdir=%{py_sitedir} \
-	--with-qemu=qemu \
 	--enable-install-daemon \
 	%{!?with_appliance:--disable-appliance} \
 	%{!?with_erlang:--disable-erlang} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libguestfs.git/commitdiff/7a7e981d34b3825f451128d219833d9d5763fd68



More information about the pld-cvs-commit mailing list