[ofa-general] Re: [PATCH] uDAPL 1.2 mods to coexist with uDAPL 2.0

[James Lentini]

I agree with the goal of supporting both 1.2 and 2.0 implementations 
on the same system. Thanks for working on this.

Comments below:

On Thu, 20 Sep 2007, Arlin Davis wrote:

> 
> James, 
> 
> Please review patches to allow coexistence of 2.0 and 1.2 libraries. 
> 
> Modifications to DAT 1.2 package to coexist with 2.0 libraries
> - fix RPM specfile, configure.in, 1.2.2 package
> - update dat.conf
>      
> 
> Signed-off by: Arlin Davis ardavis at ichips.intel.com
> 
> diff --git a/configure.in b/configure.in
> index e11fa73..3cb3d1b 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -1,11 +1,11 @@
>  dnl Process this file with autoconf to produce a configure script.
>  
>  AC_PREREQ(2.57)
> -AC_INIT(dapl, 1.2.1, openib-general at openib.org)
> +AC_INIT(dapl, 1.2.2, openib-general at openib.org)

How about general at lists.openfabrics.org?

>  AC_CONFIG_SRCDIR([dat/udat/udat.c])
>  AC_CONFIG_AUX_DIR(config)
>  AM_CONFIG_HEADER(config.h)
> -AM_INIT_AUTOMAKE(dapl, 1.2.1)
> +AM_INIT_AUTOMAKE(dapl, 1.2.2)
>  
>  AM_PROG_LIBTOOL
>  
> diff --git a/doc/dat.conf b/doc/dat.conf
> index cb9ff00..005f9ee 100644
> --- a/doc/dat.conf
> +++ b/doc/dat.conf
> @@ -1,5 +1,5 @@
>  #
> -# DAT 1.2 configuration file
> +# DAT 1.2 and 2.0 configuration file
>  #
>  # Each entry should have the following fields:
>  #
> @@ -9,13 +9,18 @@
>  # For the uDAPL cma provder, specify <ia_params> as one of the following:
>  #       network address, network hostname, or netdev name and 0 for port
>  #
> -# Simple (OpenIB-cma) default with netdev name provided first on list 
> +# Simple (OpenIB-cma) default with netdev name provided first on list
>  # to enable use of same dat.conf version on all nodes
> -# 
> -# Add examples for multiple interfaces and IPoIB HA fail over, and bonding 
>  #
> -OpenIB-cma u1.2 nonthreadsafe default /usr/lib/libdaplcma.so dapl.1.2 "ib0 0" ""
> -OpenIB-cma-1 u1.2 nonthreadsafe default /usr/lib/libdaplcma.so dapl.1.2 "ib1 0" ""
> -OpenIB-cma-2 u1.2 nonthreadsafe default /usr/lib/libdaplcma.so dapl.1.2 "ib2 0" ""
> -OpenIB-cma-3 u1.2 nonthreadsafe default /usr/lib/libdaplcma.so dapl.1.2 "ib3 0" ""
> -OpenIB-bond u1.2 nonthreadsafe default /usr/lib/libdaplcma.so dapl.1.2 "bond0 0" ""
> +# Add examples for multiple interfaces and IPoIB HA fail over, and bonding

As in the comments in my previous mail, this looks like a TODO to me.

> +#
> +OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "ib0 0" ""
> +OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "ib1 0" ""
> +OpenIB-cma-2 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "ib2 0" ""
> +OpenIB-cma-3 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "ib3 0" ""
> +OpenIB-bond u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "bond0 0" ""
> +OpenIB-2-cma u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "ib0 0" ""
> +OpenIB-2-cma-1 u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "ib1 0" ""
> +OpenIB-2-cma-2 u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "ib2 0" ""
> +OpenIB-2-cma-3 u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "ib3 0" ""
> +OpenIB-2-bond u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "bond0 0" ""
> diff --git a/libdat.spec.in b/libdat.spec.in
> index 7e81b97..15b8694 100644
> --- a/libdat.spec.in
> +++ b/libdat.spec.in
> @@ -33,7 +33,7 @@
>  # $Id: $
>  
>  %define ver 1.2
> -%define RELEASE 1 
> +%define RELEASE 2 
>  %define rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
>  
>  Summary: Userspace DAT and DAPL API.
> @@ -43,8 +43,8 @@ Release: %rel%{?dist}
>  
>  License: Dual GPL/BSD/CPL
>  Group: System Environment/Libraries
> -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> -Source: http://openfabrics.org/~ardavis/%{name}-%{version}-%{release}.tgz
> +BuildRoot: %{_tmppath}/%{name}-%{version}.%{release}-root-%(%{__id_u} -n)
> +Source: http://openfabrics.org/downloads/dapl/%{name}-%{version}.%{release}.tar.gz
>  Url: http://openfabrics.org/
>  
>  %description
> @@ -54,7 +54,7 @@ RDMA API that supports DAT 1.2 specification
>  %package devel
>  Summary: Development files for the libdat and libdapl libraries
>  Group: System Environment/Libraries
> -Requires: %{name} = %{version}-%{release} 
> +Requires: %{name} = %{version}.%{release} 
>  
>  %description devel
>  Static libraries and header files for the libdat and libdapl library.
> @@ -62,16 +62,15 @@ Static libraries and header files for the libdat and libdapl library.
>  %package utils
>  Summary: Test suites for uDAPL library
>  Group: System Environment/Libraries
> -Requires: %{name} = %{version}-%{release}
> +Requires: %{name} = %{version}.%{release}
>  
>  %description utils
>  Useful test suites to validate uDAPL library API's.
>  
>  %prep
> -%setup -q -n %{name}
> +%setup -q -n %{name}-%{version}.%{release}
>  
>  %build
> -./autogen.sh
>  %configure
>  make
>  
> @@ -112,7 +111,10 @@ rm -rf $RPM_BUILD_ROOT
>  %{_mandir}/man1/*
>  
>  %changelog
> -* Wed June 6 2007 Arlin Davis <ardavis at ichips.intel.com> - 1.2.1
> +* Wed Jun 6 2007 Arlin Davis <ardavis at ichips.intel.com> - 1.2.2
> +- OFED 1.3,   DAT/DAPL Version 1.2, Release 2
> +
> +* Wed Jun 6 2007 Arlin Davis <ardavis at ichips.intel.com> - 1.2.1
>  - OFED 1.2,   DAT/DAPL Version 1.2, Release 1
>  
>  * Fri Oct 20 2006 Arlin Davis <ardavis at ichips.intel.com> - 1.2.0
>