libvirt/703ec1b7-qemu-bridge-helper-fix.patch
James Fehlig 7012e84cf0 Accepting request 342482 from home:jfehlig:branches:Virtualization
- Detect path of qemu-bridge-helper during %configure
  - add qemu-tools as BuildRequires for suse_version > 1130
  - add upstream patch 703ec1b7-qemu-bridge-helper-fix.patch

- Update to libvirt 1.2.21
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    disable-virCgroupGetPercpuStats-test.patch

- spec: some minor wireshark fixups. Essentially a backport of
  commit 7c8250d7.

OBS-URL: https://build.opensuse.org/request/show/342482
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=497
2015-11-05 00:23:08 +00:00

25 lines
981 B
Diff

commit 703ec1b73da3560374cba65017d9eaf58f92c695
Author: Michel Normand <normand@linux.vnet.ibm.com>
Date: Wed Nov 4 10:01:24 2015 +0100
qemu: add /usr/lib to AC_PATH_PROG for qemu-bridge-helper
For openSUSE the qemu-bridge-helper is installed in /usr/lib
So libvirt has to search it in this directory.
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
diff --git a/configure.ac b/configure.ac
index f01bb40..f481c50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2520,7 +2520,7 @@ AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account])
AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account])
AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], [/usr/libexec/qemu-bridge-helper],
- [/usr/libexec:/usr/lib/qemu])
+ [/usr/libexec:/usr/lib/qemu:/usr/lib])
AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], [QEMU bridge helper])
AC_ARG_WITH([macvtap],