[openib-general] Please give 1.0 RC1 a whirl
James Lentini
jlentini at netapp.com
Wed Mar 15 13:26:18 PST 2006
On Wed, 15 Mar 2006, Moni Shoua wrote:
> Sending patch again. This time as an attachment
>
> This patch automates the build of dat and udapl.
Thanks for working on this Moni.
> It also modifies the packaging of librdmacm
The librdmacm changes should be split into a seperate patch and sent
to Sean Hefty [mshefty at ichips.intel.com].
> to build dat/dapl one should run the following commands in
> src/userspace/dapl/dat and src/userspace/dapl/dapl
> # sh ./autogen.sh
> # ./configure
> # make dist-gzip
> # rpmbuild -ta *.gz
>
> build of dapl requires that RPMs libibverns-devel librdmacm and dat are
> installed.
A couple of questions:
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dapl/autogen.sh openib.org/src/userspace/dapl/dapl/autogen.sh
>--- openib.org.fresh/src/userspace/dapl/dapl/autogen.sh 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dapl/autogen.sh 2006-03-14 17:03:45.000000000 +0200
>@@ -0,0 +1,9 @@
>+#! /bin/sh
>+
>+set -x
>+aclocal -I config
>+libtoolize --force --copy
>+autoheader
>+automake --foreign --add-missing --copy
>+autoconf
>+
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dapl/configure.in openib.org/src/userspace/dapl/dapl/configure.in
>--- openib.org.fresh/src/userspace/dapl/dapl/configure.in 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dapl/configure.in 2006-03-14 17:03:45.000000000 +0200
>@@ -0,0 +1,41 @@
>+dnl Process this file with autoconf to produce a configure script.
>+
>+AC_PREREQ(2.57)
>+AC_INIT(dapl, 0.9.0, openib-general at openib.org)
Can there be multiple bug report addresses? I'd like bug reports to
also go to [dapl-devel at lists.sourceforge.net].
>+AC_CONFIG_SRCDIR([udapl/dapl_init.c])
>+AC_CONFIG_AUX_DIR(config)
>+AM_CONFIG_HEADER(config.h)
>+AM_INIT_AUTOMAKE(dapl, 0.9.0)
>+
>+dnl Checks for programs
>+AC_PROG_CXX
>+AC_PROG_CC
>+AC_PROG_CPP
>+AC_PROG_INSTALL
>+AC_PROG_LN_S
>+AC_PROG_MAKE_SET
>+AM_PROG_LIBTOOL
>+
>+dnl Checks for header files.
>+AC_HEADER_STDC
>+
>+dnl Checks for library functions
>+AC_TYPE_SIGNAL
>+AC_FUNC_VPRINTF
>+
>+dnl Checks for typedefs, structures, and compiler characteristics.
>+AC_C_CONST
>+AC_C_INLINE
>+AC_STRUCT_TM
>+
>+AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
>+ if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
>+ ac_cv_version_script=yes
>+ else
>+ ac_cv_version_script=no
>+ fi)
>+
>+AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")
>+
>+AC_CONFIG_FILES([Makefile dapl.spec])
>+AC_OUTPUT
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dapl/dapl.spec.in openib.org/src/userspace/dapl/dapl/dapl.spec.in
>--- openib.org.fresh/src/userspace/dapl/dapl/dapl.spec.in 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dapl/dapl.spec.in 2006-03-15 15:25:53.000000000 +0200
>@@ -0,0 +1,41 @@
>+# $Id: ipoibcfg.spec.in 28 2004-04-07 20:00:33Z roland $
We should remove the ipoibcfg version string.
>+
>+%define prefix /usr
>+%define ver @VERSION@
>+%define RELEASE 1
>+%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
>+
>+
>+Summary: This package contains the User Direct Access Programming Library (uDAPL)
>+Name: dapl
>+Version: %ver
>+Release: %{rel}%{?dist}
>+License: GPL/BSD
To be 100% accurate, this should be GPL/BSD/CPL
>+Group: Applications/System
>+BuildRoot: %{_tmppath}/%{name}-%{version}-root
>+Source: http://openib.org/downloads/%{name}-%{version}.tar.gz
>+Url: http://openib.org/
>+
>+%description
>+udat is
Do you need more text here?
>+
>+%prep
>+%setup -q
>+
>+%build
>+%configure
>+pwd
>+make -C udapl clean
>+make -C udapl
>+
>+%install
>+make -C udapl PREFIX=${RPM_BUILD_ROOT} install
>+
>+%clean
>+rm -rf $RPM_BUILD_ROOT
>+
>+
>+%files
>+%{prefix}/lib64/libdapl.a
>+%{prefix}/lib64/libdapl.so
What about 32-bit libraries?
>+%defattr(-,root,root)
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dapl/Makefile.am openib.org/src/userspace/dapl/dapl/Makefile.am
>--- openib.org.fresh/src/userspace/dapl/dapl/Makefile.am 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dapl/Makefile.am 2006-03-14 17:03:45.000000000 +0200
>@@ -0,0 +1,32 @@
>+
>+SUBDIRS = .
>+
>+INCLUDES = -I$(srcdir)/include
>+#INCLUDES = -I$(srcdir)/include/infiniband
>+
>+lib_LTLIBRARIES = libdapl.la
>+
>+libdapl_la_CFLAGS = -Wall
>+
>+if HAVE_LD_VERSION_SCRIPT
>+# libdapl_version_script = -Wl,--version-script=$(srcdir)/dat.map
>+ libdapl_version_script =
>+else
>+ libdapl_version_script =
>+endif
>+
>+libdapl_la_SOURCES = udapl/linux/dapl_osd.c udapl/dapl_evd_clear_unwaitable.c udapl/dapl_evd_disable.c udapl/dapl_evd_create.c udapl/dapl_evd_wait.c udapl/dapl_cno_create.c udapl/dapl_init.c udapl/dapl_evd_query.c udapl/dapl_cno_wait.c udapl/dapl_evd_set_unwaitable.c udapl/dapl_cno_query.c udapl/dapl_cno_modify_agent.c udapl/dapl_lmr_create.c udapl/dapl_cno_free.c udapl/dapl_evd_modify_cno.c udapl/dapl_evd_enable.c
>+libdapl_la_LDFLAGS = -version-info 1 -export-dynamic \
>+ $(libdapl_version_script)
>+
>+#libdaplincludedir = $(includedir)/infiniband
>+libdaplincludedir = $(srcdir)/include/
>+
>+libdaplinclude_HEADERS = include/dapl_debug.h include/dapl.h include/dapl_ipoib_names.h include/dapl_vendor.h
>+
>+
>+EXTRA_DIST = dapl.spec.in udapl/Makefile include/dapl_debug.h include/dapl.h include/dapl_ipoib_names.h include/dapl_vendor.h udapl/linux/dapl_osd.h openib_cma/dapl_ib_cm.c openib_cma/dapl_ib_cq.c openib_cma/dapl_ib_dto.h openib_cma/dapl_ib_mem.c openib_cma/dapl_ib_qp.c openib_cma/dapl_ib_util.c openib_cma/dapl_ib_util.h common/dapl_adapter_util.h common/dapl_cno_util.c common/dapl_cno_util.h common/dapl_cookie.c common/dapl_cookie.h common/dapl_cr_accept.c common/dapl_cr_callback.c common/dapl_cr_handoff.c common/dapl_cr_query.c common/dapl_cr_reject.c common/dapl_cr_util.c common/dapl_cr_util.h common/dapl_debug.c common/dapl_ep_connect.c common/dapl_ep_create.c common/dapl_ep_create_with_srq.c common/dapl_ep_disconnect.c common/dapl_ep_dup_connect.c common/dapl_ep_free.c common/dapl_ep_get_status.c common/dapl_ep_modify.c common/dapl_ep_post_rdma_read.c common/dapl_ep_post_rdma_write.c common/dapl_ep_post_recv.c common/dapl_ep_post_send.c common/dapl_ep_query.c common/dapl_ep_recv_query.c common/dapl_ep_reset.c common/dapl_ep_set_watermark.c common/dapl_ep_util.c common/dapl_ep_util.h common/dapl_evd_connection_callb.c common/dapl_evd_cq_async_error_callb.c common/dapl_evd_dequeue.c common/dapl_evd_dto_callb.c common/dapl_evd_free.c common/dapl_evd_post_se.c common/dapl_evd_qp_async_error_callb.c common/dapl_evd_resize.c common/dapl_evd_un_async_error_callb.c common/dapl_evd_util.c common/dapl_evd_util.h common/dapl_get_consumer_context.c common/dapl_get_handle_type.c common/dapl_hash.c common/dapl_hash.h common/dapl_hca_util.c common/dapl_hca_util.h common/dapl_ia_close.c common/dapl_ia_open.c common/dapl_ia_query.c common/dapl_ia_util.c common/dapl_ia_util.h common/dapl_init.h common/dapl_llist.c common/dapl_lmr_free.c common/dapl_lmr_query.c common/dapl_lmr_sync_rdma_read.c common/dapl_lmr_sync_rdma_write.c common/dapl_lmr_util.c common/dapl_lmr_util.h common/dapl_mr_util.c common/dapl_mr_util.h common/dapl_name_service.c common/dapl_name_service.h common/dapl_provider.c common/dapl_provider.h common/dapl_psp_create_any.c common/dapl_psp_create.c common/dapl_psp_free.c common/dapl_psp_query.c common/dapl_pz_create.c common/dapl_pz_free.c common/dapl_pz_query.c common/dapl_pz_util.c common/dapl_pz_util.h common/dapl_ring_buffer_util.c common/dapl_ring_buffer_util.h common/dapl_rmr_bind.c common/dapl_rmr_create.c common/dapl_rmr_free.c common/dapl_rmr_query.c common/dapl_rmr_util.c common/dapl_rmr_util.h common/dapl_rsp_create.c common/dapl_rsp_free.c common/dapl_rsp_query.c common/dapl_set_consumer_context.c common/dapl_sp_util.c common/dapl_sp_util.h common/dapl_srq_create.c common/dapl_srq_free.c common/dapl_srq_post_recv.c common/dapl_srq_query.c common/dapl_srq_resize.c common/dapl_srq_set_lw.c common/dapl_srq_util.c common/dapl_srq_util.h common/dapl_timer_util.c common/dapl_timer_util.h
>+# $(srcdir)/dat.map
>+
>+dist-hook: dapl.spec
>+ cp dapl.spec $(distdir)
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dapl/udapl/Makefile openib.org/src/userspace/dapl/dapl/udapl/Makefile
>--- openib.org.fresh/src/userspace/dapl/dapl/udapl/Makefile 2006-03-14 17:59:12.000000000 +0200
>+++ openib.org/src/userspace/dapl/dapl/udapl/Makefile 2006-03-14 17:05:32.000000000 +0200
>@@ -49,6 +49,9 @@
> MACH=$(shell uname -m)
> OSRELEASE=$(shell expr `uname -r | cut -f1 -d.` \* 65536 + `uname -r | cut -f2 -d.`)
>
>+INSTALL = install
>+INSTALL_FLAGS += -p
>+
> #
> # Set up the default provider
> #
>@@ -135,7 +138,7 @@
> PROVIDER = $(TOPDIR)/../openib
> CFLAGS += -DOPENIB
> CFLAGS += -DCQ_WAIT_OBJECT
>-CFLAGS += -I/usr/local/include/infiniband
>+CFLAGS += -I/usr/include/infiniband -I/usr/local/include/infiniband
Is /usr/include/infiniband the new location for the 1.0 release?
> endif
>
> #
>@@ -145,7 +148,7 @@
> PROVIDER = $(TOPDIR)/../openib_scm
> CFLAGS += -DOPENIB
> CFLAGS += -DCQ_WAIT_OBJECT
>-CFLAGS += -I/usr/local/include/infiniband
>+CFLAGS += -I/usr/include/infiniband -I/usr/local/include/infiniband
> endif
>
> #
>@@ -155,7 +158,7 @@
> PROVIDER = $(TOPDIR)/../openib_cma
> CFLAGS += -DOPENIB
> CFLAGS += -DCQ_WAIT_OBJECT
>-CFLAGS += -I/usr/local/include/infiniband
>+CFLAGS += -I/usr/include/infiniband -I/usr/local/include/infiniband
> endif
>
> #
>@@ -266,21 +269,21 @@
>
> ifeq ($(VERBS),openib)
> LDFLAGS += -libverbs -libcm -libat
>-LDFLAGS += -rpath /usr/local/lib -L /usr/local/lib
>+LDFLAGS += -rpath /usr/local/lib64 -L /usr/local/lib64
I'd like to be able to build on both 32-bit and 64-bit systems. Can
you think of a clean way to do that?
We could add a variable suffix, something like:
LDFLAGS += -rpath /usr/local/lib$(BIN_TYPE) -L /usr/local/lib$(BIN_TYPE)
> PROVIDER_SRCS = dapl_ib_util.c dapl_ib_cq.c dapl_ib_qp.c
> PROVIDER_SRCS += dapl_ib_cm.c dapl_ib_mem.c
> endif
>
> ifeq ($(VERBS),openib_scm)
> LDFLAGS += -libverbs
>-LDFLAGS += -rpath /usr/local/lib -L /usr/local/lib
>+LDFLAGS += -rpath /usr/local/lib64 -L /usr/local/lib64
> PROVIDER_SRCS = dapl_ib_util.c dapl_ib_cq.c dapl_ib_qp.c \
> dapl_ib_cm.c dapl_ib_mem.c
> endif
>
> ifeq ($(VERBS),openib_cma)
> LDFLAGS += -libverbs -lrdmacm
>-LDFLAGS += -rpath /usr/local/lib -L /usr/local/lib
>+LDFLAGS += -rpath /usr/local/lib64 -L /usr/local/lib64
> PROVIDER_SRCS = dapl_ib_util.c dapl_ib_cq.c dapl_ib_qp.c \
> dapl_ib_cm.c dapl_ib_mem.c
> endif
>@@ -438,3 +441,8 @@
> rm -f ../vapi/*~
> rm -f ../ibapi/*~
> rm -f linux/*~
>+install: all
>+ mkdir -p $(PREFIX)/usr/lib64
>+ $(INSTALL) $(INSTALL_FLAGS) -m 755 $(TARGET) $(PREFIX)/usr/lib64/libdapl.so
>+ $(INSTALL) $(INSTALL_FLAGS) -m 644 $(STATIC) $(PREFIX)/usr/lib64/libdapl.a
>+
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dat/autogen.sh openib.org/src/userspace/dapl/dat/autogen.sh
>--- openib.org.fresh/src/userspace/dapl/dat/autogen.sh 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dat/autogen.sh 2006-03-14 16:01:26.000000000 +0200
>@@ -0,0 +1,9 @@
>+#! /bin/sh
>+
>+set -x
>+aclocal -I config
>+libtoolize --force --copy
>+autoheader
>+automake --foreign --add-missing --copy
>+autoconf
>+
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dat/configure.in openib.org/src/userspace/dapl/dat/configure.in
>--- openib.org.fresh/src/userspace/dapl/dat/configure.in 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dat/configure.in 2006-03-14 16:01:26.000000000 +0200
>@@ -0,0 +1,46 @@
>+dnl Process this file with autoconf to produce a configure script.
>+
>+AC_PREREQ(2.57)
>+AC_INIT(dat, 0.9.0, openib-general at openib.org)
I'd like bug reports to also go to [dapl-devel at lists.sourceforge.net].
>+AC_CONFIG_SRCDIR([udat/udat.c])
>+AC_CONFIG_AUX_DIR(config)
>+AM_CONFIG_HEADER(config.h)
>+AM_INIT_AUTOMAKE(dat, 0.9.0)
>+
>+dnl Checks for programs
>+AC_PROG_CXX
>+AC_PROG_CC
>+AC_PROG_CPP
>+AC_PROG_INSTALL
>+AC_PROG_LN_S
>+AC_PROG_MAKE_SET
>+AM_PROG_LIBTOOL
>+
>+dnl Checks for libraries
>+AC_CHECK_LIB(dl, dlsym, [],
>+ AC_MSG_ERROR([dlsym() not found. libibverbs requires libdl.]))
>+
>+dnl Checks for header files.
>+AC_HEADER_STDC
>+
>+
>+dnl Checks for library functions
>+AC_TYPE_SIGNAL
>+AC_FUNC_VPRINTF
>+
>+dnl Checks for typedefs, structures, and compiler characteristics.
>+AC_C_CONST
>+AC_C_INLINE
>+AC_STRUCT_TM
>+
>+AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
>+ if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
>+ ac_cv_version_script=yes
>+ else
>+ ac_cv_version_script=no
>+ fi)
>+
>+AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")
>+
>+AC_CONFIG_FILES([Makefile dat.spec])
>+AC_OUTPUT
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dat/dat.spec.in openib.org/src/userspace/dapl/dat/dat.spec.in
>--- openib.org.fresh/src/userspace/dapl/dat/dat.spec.in 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dat/dat.spec.in 2006-03-15 14:02:17.000000000 +0200
>@@ -0,0 +1,62 @@
>+
>+%define prefix /usr
>+%define ver @VERSION@
>+%define RELEASE 1
>+%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
>+
>+
>+Summary: This package contains the DAT (Direct Access Transport) library
>+Name: dat
>+Version: %ver
>+Release: %{rel}%{?dist}
>+License: GPL/BSD
To be 100% accurate this should be GPL/BSD/CPL
>+Group: Applications/System
>+BuildRoot: %{_tmppath}/%{name}-%{version}-root
>+Source: http://openib.org/downloads/%{name}-%{version}.tar.gz
>+Url: http://openib.org/
>+
>+%ifarch x86_64
>+%define dual_arch 1
>+%endif
>+
>+%description
>+udat is
Do we need more text here?
>+
>+%prep
>+%setup -q
>+
>+%build
>+%configure
>+pwd
>+make -C udat clean
>+make -C udat
>+
>+%install
>+make -C udat PREFIX=${RPM_BUILD_ROOT} install
>+%clean
>+rm -rf $RPM_BUILD_ROOT
>+
>+%files
>+%{prefix}/include/dat/dat.h
>+%{prefix}/include/dat/dat_error.h
>+%{prefix}/include/dat/dat_platform_specific.h
>+%{prefix}/include/dat/dat_redirection.h
>+%{prefix}/include/dat/dat_registry.h
>+%{prefix}/include/dat/dat_vendor_specific.h
>+%{prefix}/include/dat/kdat.h
>+%{prefix}/include/dat/kdat_config.h
>+%{prefix}/include/dat/kdat_redirection.h
>+%{prefix}/include/dat/kdat_vendor_specific.h
>+%{prefix}/include/dat/udat.h
>+%{prefix}/include/dat/udat_config.h
>+%{prefix}/include/dat/udat_redirection.h
>+%{prefix}/include/dat/udat_vendor_specific.h
>+%{prefix}/lib/libdat.a
>+%{prefix}/lib/libdat.so
>+/etc/dat.conf
>+%if %{dual_arch}
>+%{prefix}/lib64/libdat.a
>+%{prefix}/lib64/libdat.so
>+%endif
>+
>+%defattr(-,root,root)
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dat/Makefile.am openib.org/src/userspace/dapl/dat/Makefile.am
>--- openib.org.fresh/src/userspace/dapl/dat/Makefile.am 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dat/Makefile.am 2006-03-14 16:01:26.000000000 +0200
>@@ -0,0 +1,32 @@
>+
>+SUBDIRS = .
>+
>+INCLUDES = -I$(srcdir)/include
>+#INCLUDES = -I$(srcdir)/include/infiniband
Does including this line serve any purpose?
>+
>+lib_LTLIBRARIES = libdat.la
>+
>+libdat_la_CFLAGS = -Wall
>+
>+if HAVE_LD_VERSION_SCRIPT
>+# libdat_version_script = -Wl,--version-script=$(srcdir)/dat.map
ditto
>+ libdat_version_script =
>+else
>+ libdat_version_script =
>+endif
>+
>+libdat_la_SOURCES = udat/linux/dat_osd.c udat/udat_api.c udat/udat.c udat/udat_sr_parser.c
>+libdat_la_LDFLAGS = -version-info 1 -export-dynamic \
>+ $(libdat_version_script)
>+
>+#libdatincludedir = $(includedir)/infiniband
>+libdatincludedir = $(srcdir)/include/
>+
>+libdatinclude_HEADERS = include/dat/dat_error.h include/dat/udat.h include/dat/dat_vendor_specific.h include/dat/kdat_redirection.h include/dat/udat_vendor_specific.h include/dat/dat_redirection.h include/dat/udat_redirection.h include/dat/dat_registry.h include/dat/udat_config.h include/dat/dat_platform_specific.h include/dat/kdat.h include/dat/dat.h include/dat/kdat_vendor_specific.h include/dat/kdat_config.h
>+
>+
>+EXTRA_DIST = dat.spec.in udat/Makefile include/dat/dat_error.h include/dat/udat.h include/dat/dat_vendor_specific.h include/dat/kdat_redirection.h include/dat/udat_vendor_specific.h include/dat/dat_redirection.h include/dat/udat_redirection.h include/dat/dat_registry.h include/dat/udat_config.h include/dat/dat_platform_specific.h include/dat/kdat.h include/dat/dat.h include/dat/kdat_vendor_specific.h include/dat/kdat_config.h common/dat_api.c common/dat_dictionary.c common/dat_dictionary.h common/dat_dr.c common/dat_dr.h common/dat_init.c common/dat_init.h common/dat_sr.c common/dat_sr.h common/dat_strerror.c udat/linux/dat_osd.h udat/udat_sr_parser.h udat/dat.conf
>+# $(srcdir)/dat.map
ditto
>+
>+dist-hook: dat.spec
>+ cp dat.spec $(distdir)
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dat/udat/dat.conf openib.org/src/userspace/dapl/dat/udat/dat.conf
>--- openib.org.fresh/src/userspace/dapl/dat/udat/dat.conf 1970-01-01 02:00:00.000000000 +0200
>+++ openib.org/src/userspace/dapl/dat/udat/dat.conf 2006-03-14 16:03:58.000000000 +0200
I'd like this to go in src/userspace/dapl/doc/dat.conf
>@@ -0,0 +1,16 @@
>+#
>+# DAT 1.2 configuration file
>+#
>+# Each entry should have the following fields:
>+#
>+# <ia_name> <api_version> <threadsafety> <default> <lib_path> \
>+# <provider_version> <ia_params> <platform_params>
>+#
>+# Example for openib_cma and openib_scm
>+#
>+# For scm version you specify <ia_params> as actual device name and port
>+# For cma version you specify <ia_params> as:
>+# network address, network hostname, or netdev name and 0 for port
>+#
>+ib0 u1.2 nonthreadsafe default /usr/lib64/libdapl.so mv_dapl.1.2 "ib0 0" ""
>+ib1 u1.2 nonthreadsafe default /usr/lib64/libdapl.so mv_dapl.1.2 "ib1 0" ""
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/dapl/dat/udat/Makefile openib.org/src/userspace/dapl/dat/udat/Makefile
Again, what do we do about 32-bit libraries?
>--- openib.org.fresh/src/userspace/dapl/dat/udat/Makefile 2006-03-14 17:59:15.000000000 +0200
>+++ openib.org/src/userspace/dapl/dat/udat/Makefile 2006-03-14 16:07:50.000000000 +0200
>@@ -59,6 +59,7 @@
> DYNAMIC = $(TARGET_PATH)/libdat.so
> STATIC32 = $(TARGET_PATH32)/libdat.a
> DYNAMIC32 = $(TARGET_PATH32)/libdat.so
>+CONF=$(UDAT_ROOT)/dat.conf
>
> ifeq "$(ARCH)" "x86_64"
> DUAL_ARCH = true
>@@ -155,6 +156,7 @@
> #
>
> ifdef DUAL_ARCH
>+#all: mkdirs $(DYNAMIC) $(STATIC)
There's no reason to add this line, correct?
> all: mkdirs $(DYNAMIC) $(STATIC) $(DYNAMIC32) $(STATIC32)
> else
> all: mkdirs $(DYNAMIC) $(STATIC)
>@@ -225,6 +227,9 @@
> rm -rf $(RPM_PATH)
>
> install: all
>+ mkdir -p $(PREFIX)/usr/lib
>+ mkdir -p $(PREFIX)/usr/lib64
>+ mkdir -p $(PREFIX)/etc
> ifdef DUAL_ARCH
> $(INSTALL) $(INSTALL_FLAGS) -m 755 $(DYNAMIC32) $(PREFIX)/usr/lib/libdat.so
> $(INSTALL) $(INSTALL_FLAGS) -m 644 $(STATIC32) $(PREFIX)/usr/lib/libdat.a
>@@ -236,6 +241,7 @@
> endif
> $(INSTALL) $(INSTALL_FLAGS) -m 755 -d $(DAT_HEADERS_SYSTEM_PATH)
> $(INSTALL) $(INSTALL_FLAGS) -m 644 $(DAT_HEADERS)/dat/*.h $(DAT_HEADERS_SYSTEM_PATH)
>+ $(INSTALL) $(INSTALL_FLAGS) -m 644 $(CONF) $(PREFIX)/etc/dat.conf
>
> clean:
> rm -f $(OBJ_PATH)/*.o
>diff --exclude=.svn -urN openib.org.fresh/src/userspace/librdmacm/librdmacm.spec.in openib.org/src/userspace/librdmacm/librdmacm.spec.in
>--- openib.org.fresh/src/userspace/librdmacm/librdmacm.spec.in 2006-03-14 18:01:36.000000000 +0200
>+++ openib.org/src/userspace/librdmacm/librdmacm.spec.in 2006-03-15 13:10:25.000000000 +0200
>@@ -1,15 +1,16 @@
> # $Id: $
>
> %define prefix /usr
>-%define ver @VERSION@
>+%define ver @VERSION@
> %define RELEASE 1
> %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
>
>+
> Summary: Userspace RDMA Connection Manager.
> Name: librdmacm
> Version: %ver
>-Release: %rel
>-Copyright: Dual GPL/BSD
>+Release: %{rel}%{?dist}
>+License: Dual GPL/BSD
> Group: System Environment/Libraries
> BuildRoot: %{_tmppath}/%{name}-%{version}-root
> Source: http://openib.org/downloads/%{name}-%{version}.tar.gz
>@@ -36,5 +37,10 @@
>
> %files
> %defattr(-,root,root)
>-%{_libdir}/librdmacm*.so.*
>+%{_libdir}/librdmacm*.so
>+%{prefix}/bin/ucmatose
>+%{prefix}/include/rdma/rdma_cma.h
>+%{prefix}/include/rdma/rdma_cma_abi.h
>+%{prefix}/bin/rping
>+
> %doc AUTHORS COPYING ChangeLog NEWS README
More information about the general
mailing list