[libvirt] rebased multipath patch

Daniel Veillard veillard at redhat.com
Tue Sep 8 14:10:07 UTC 2009


On Thu, Sep 03, 2009 at 06:03:00PM +0100, Daniel P. Berrange wrote:
> On Wed, Sep 02, 2009 at 11:28:27AM -0400, Dave Allan wrote:
> > @@ -1177,6 +1180,26 @@ if test "$with_storage_scsi" = "check"; then
> >  fi
> >  AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"])
> >  
> > +if test "$with_storage_mpath" = "check"; then
> > +   with_storage_mpath=yes
> > +
> > +   AC_DEFINE_UNQUOTED([WITH_STORAGE_MPATH], 1,
> > +     [whether mpath backend for storage driver is enabled])
> > +fi
> > +AM_CONDITIONAL([WITH_STORAGE_MPATH], [test "$with_storage_mpath" = "yes"])
> > +
> > +if test "$with_storage_mpath" = "yes"; then
> > +   DEVMAPPER_REQUIRED=0.0
> > +   DEVMAPPER_CFLAGS=
> > +   DEVMAPPER_LIBS=
> > +   PKG_CHECK_MODULES(DEVMAPPER, devmapper >= $DEVMAPPER_REQUIRED,
> > +    [], [
> > +    AC_MSG_ERROR(
> > +    [You must install device-mapper-devel >= $DEVMAPPER_REQUIRED to compile libvirt])
> > +    ])
> > +fi
> > +AC_SUBST([DEVMAPPER_CFLAGS])
> > +AC_SUBST([DEVMAPPER_LIBS])
> 
> 
> Need to update livbvirt.spec.in with a dependancy on device mapper for this
> tool, both Requires & BuildRequries

  Done, enclosed, since this was trivial, I commited too

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/
-------------- next part --------------
diff --git a/libvirt.spec.in b/libvirt.spec.in
index c12206d..9371898 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -18,6 +18,7 @@
 %define with_storage_lvm   0%{!?_without_storage_lvm:1}
 %define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
 %define with_storage_disk  0%{!?_without_storage_disk:1}
+%define with_storage_mpath 0%{!?_without_storage_mpath:1}
 %define with_numactl       0%{!?_without_numactl:1}
 
 # default to off - selectively enabled below
@@ -131,6 +132,10 @@ Requires: iscsi-initiator-utils
 # For disk driver
 Requires: parted
 %endif
+%if %{with_storage_mpath}
+# For multipath support
+Requires: device-mapper
+%endif
 %if %{with_xen}
 BuildRequires: xen-devel
 %endif
@@ -186,6 +191,10 @@ BuildRequires: iscsi-initiator-utils
 # For disk driver
 BuildRequires: parted-devel
 %endif
+%if %{with_storage_mpath}
+# For Multipath support
+BuildRequires: device-mapper-devel
+%endif
 %if %{with_numactl}
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
@@ -333,6 +342,10 @@ of recent versions of Linux (and other OSes).
 %define _without_storage_disk --without-storage-disk
 %endif
 
+%if ! %{with_storage_mpath}
+%define _without_storage_mpath --without-storage-mpath
+%endif
+
 %if ! %{with_numactl}
 %define _without_numactl --without-numactl
 %endif
@@ -364,6 +377,7 @@ of recent versions of Linux (and other OSes).
            %{?_without_storage_lvm} \
            %{?_without_storage_iscsi} \
            %{?_without_storage_disk} \
+           %{?_without_storage_mpath} \
            %{?_without_numactl} \
            %{?_without_capng} \
            %{?_without_netcf} \


More information about the libvir-list mailing list