[openib-general] [PATCH v3 3/6] libibverbs configuration files changes.
Krishna Kumar
krkumar2 at in.ibm.com
Thu Aug 3 01:37:49 PDT 2006
Configuration/Makefiles to build libibverbs with the new API.
Signed-off-by: Krishna Kumar <krkumar2 at in.ibm.com>
diff -ruNp ORG/libibverbs/Makefile.am NEW/libibverbs/Makefile.am
--- ORG/libibverbs/Makefile.am 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/Makefile.am 2006-08-03 17:15:33.000000000 -0700
@@ -9,7 +9,7 @@ AM_CFLAGS = -g -Wall -D_GNU_SOURCE
src_libibverbs_la_CFLAGS = -g -Wall -D_GNU_SOURCE -DDRIVER_PATH=\"$(libdir)/infiniband\"
if HAVE_LD_VERSION_SCRIPT
- libibverbs_version_script = -Wl,--version-script=$(srcdir)/src/libibverbs.map
+ libibverbs_version_script = -Wl,--version-script=$(srcdir)/src/librdmaverbs.map
else
libibverbs_version_script =
endif
@@ -18,7 +18,7 @@ src_libibverbs_la_SOURCES = src/cmd.c sr
src/memory.c src/sysfs.c src/verbs.c
src_libibverbs_la_LDFLAGS = -version-info 2 -export-dynamic \
$(libibverbs_version_script)
-src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/libibverbs.map
+src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/librdmaverbs.map
bin_PROGRAMS = examples/ibv_devices examples/ibv_devinfo \
examples/ibv_asyncwatch examples/ibv_rc_pingpong examples/ibv_uc_pingpong \
@@ -42,7 +42,8 @@ libibverbsincludedir = $(includedir)/inf
libibverbsinclude_HEADERS = include/infiniband/arch.h include/infiniband/driver.h \
include/infiniband/kern-abi.h include/infiniband/opcode.h include/infiniband/verbs.h \
- include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h
+ include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h \
+ include/infiniband/deprecate.h
man_MANS = man/ibv_asyncwatch.1 man/ibv_devices.1 man/ibv_devinfo.1 \
man/ibv_rc_pingpong.1 man/ibv_uc_pingpong.1 man/ibv_ud_pingpong.1 \
@@ -56,8 +57,9 @@ DEBIAN = debian/changelog debian/compat
EXTRA_DIST = include/infiniband/driver.h include/infiniband/kern-abi.h \
include/infiniband/opcode.h include/infiniband/verbs.h include/infiniband/marshall.h \
include/infiniband/sa-kern-abi.h include/infiniband/sa.h \
- src/ibverbs.h examples/pingpong.h \
- src/libibverbs.map libibverbs.spec.in $(man_MANS)
+ include/infiniband/deprecate.h \
+ src/rdmaverbs.h examples/pingpong.h \
+ src/librdmaverbs.map libibverbs.spec.in $(man_MANS)
dist-hook: libibverbs.spec
cp libibverbs.spec $(distdir)
diff -ruNp ORG/libibverbs/configure.in NEW/libibverbs/configure.in
--- ORG/libibverbs/configure.in 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/configure.in 2006-08-02 18:24:49.000000000 -0700
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p
AC_PREREQ(2.57)
AC_INIT(libibverbs, 1.1-pre1, openib-general at openib.org)
-AC_CONFIG_SRCDIR([src/ibverbs.h])
+AC_CONFIG_SRCDIR([src/rdmaverbs.h])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(libibverbs, 1.1-pre1)
@@ -33,5 +33,5 @@ AC_CACHE_CHECK(whether ld accepts --vers
AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")
-AC_CONFIG_FILES([Makefile libibverbs.spec])
+AC_CONFIG_FILES([Makefile librdmaverbs.spec])
AC_OUTPUT
diff -ruNp ORG/libibverbs/libibverbs.spec.in NEW/libibverbs/libibverbs.spec.in
--- ORG/libibverbs/libibverbs.spec.in 2006-07-30 21:18:16.000000000 -0700
+++ NEW/libibverbs/libibverbs.spec.in 1969-12-31 16:00:00.000000000 -0800
@@ -1,106 +0,0 @@
-# $Id: libibverbs.spec.in 7484 2006-05-24 21:12:21Z roland $
-
-%define ver @VERSION@
-
-Name: libibverbs
-Version: 1.1
-Release: 0.1.pre1%{?dist}
-Summary: A library for direct userspace use of InfiniBand
-
-Group: System Environment/Libraries
-License: GPL/BSD
-Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.1-pre1.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-libibverbs is a library that allows userspace processes to use
-InfiniBand "verbs" as described in the InfiniBand Architecture
-Specification. This includes direct hardware access for fast path
-operations.
-
-For this library to be useful, a device-specific plug-in module should
-also be installed.
-
-%package devel
-Summary: Development files for the libibverbs library
-Group: System Environment/Libraries
-
-%description devel
-Static libraries and header files for the libibverbs verbs library.
-
-%package utils
-Summary: Examples for the libibverbs library
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description utils
-Useful libibverbs1 example programs such as ibv_devinfo, which
-displays information about InfiniBand devices.
-
-%prep
-%setup -q -n %{name}-%{ver}
-
-%build
-%configure
-make %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libibverbs*.so.*
-%doc AUTHORS COPYING ChangeLog README
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{_libdir}/*.a
-%{_includedir}/*
-
-%files utils
-%defattr(-,root,root,-)
-%{_bindir}/*
-%{_mandir}/man1/*
-
-%changelog
-* Mon May 22 2006 Roland Dreier <rdreier at cisco.com> - 1.1-0.1.pre1
-- New upstream release
-- Remove dependency on libsysfs, since it is no longer used
-
-* Thu May 4 2006 Roland Dreier <rdreier at cisco.com> - 1.0.4-1
-- New upstream release
-
-* Mon Mar 14 2006 Roland Dreier <rdreier at cisco.com> - 1.0.3-1
-- New upstream release
-
-* Mon Mar 13 2006 Roland Dreier <rdreier at cisco.com> - 1.0.1-1
-- New upstream release
-
-* Thu Feb 16 2006 Roland Dreier <rdreier at cisco.com> - 1.0-1
-- New upstream release
-
-* Wed Feb 15 2006 Roland Dreier <rolandd at cisco.com> - 1.0-0.5.rc7
-- New upstream release
-
-* Sun Jan 22 2006 Roland Dreier <rolandd at cisco.com> - 1.0-0.4.rc6
-- New upstream release
-
-* Tue Oct 25 2005 Roland Dreier <rolandd at cisco.com> - 1.0-0.3.rc5
-- New upstream release
-
-* Wed Oct 5 2005 Roland Dreier <rolandd at cisco.com> - 1.0-0.2.rc4
-- Update to upstream 1.0-rc4 release
-
-* Mon Sep 26 2005 Roland Dreier <rolandd at cisco.com> - 1.0-0.1.rc3
-- Initial attempt at Fedora Extras-compliant spec file
diff -ruNp ORG/libibverbs/librdmaverbs.spec.in NEW/libibverbs/librdmaverbs.spec.in
--- ORG/libibverbs/librdmaverbs.spec.in 1969-12-31 16:00:00.000000000 -0800
+++ NEW/libibverbs/librdmaverbs.spec.in 2006-08-02 18:24:49.000000000 -0700
@@ -0,0 +1,106 @@
+# $Id:
+
+%define ver @VERSION@
+
+Name: libibverbs
+Version: 1.1
+Release: 0.1.pre1%{?dist}
+Summary: A library for direct userspace use of InfiniBand
+
+Group: System Environment/Libraries
+License: GPL/BSD
+Url: http://openib.org/
+Source: http://openib.org/downloads/libibverbs-1.1-pre1.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+libibverbs is a library that allows userspace processes to use
+InfiniBand and iWARP "verbs" as described in the InfiniBand Architecture
+Specification and the iWARP documents. This includes direct hardware access
+for fast path operations.
+
+For this library to be useful, a device-specific plug-in module should
+also be installed.
+
+%package devel
+Summary: Development files for the libibverbs library
+Group: System Environment/Libraries
+
+%description devel
+Static libraries and header files for the libibverbs verbs library.
+
+%package utils
+Summary: Examples for the libibverbs library
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description utils
+Useful libibverbs example programs such as ibv_devinfo, which
+displays information about InfiniBand devices.
+
+%prep
+%setup -q -n %{name}-%{ver}
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall
+# remove unpackaged files from the buildroot
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/libibverbs*.so.*
+%doc AUTHORS COPYING ChangeLog README
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_libdir}/*.a
+%{_includedir}/*
+
+%files utils
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
+
+%changelog
+* Mon May 22 2006 Roland Dreier <rdreier at cisco.com> - 1.1-0.1.pre1
+- New upstream release
+- Remove dependency on libsysfs, since it is no longer used
+
+* Thu May 4 2006 Roland Dreier <rdreier at cisco.com> - 1.0.4-1
+- New upstream release
+
+* Mon Mar 14 2006 Roland Dreier <rdreier at cisco.com> - 1.0.3-1
+- New upstream release
+
+* Mon Mar 13 2006 Roland Dreier <rdreier at cisco.com> - 1.0.1-1
+- New upstream release
+
+* Thu Feb 16 2006 Roland Dreier <rdreier at cisco.com> - 1.0-1
+- New upstream release
+
+* Wed Feb 15 2006 Roland Dreier <rolandd at cisco.com> - 1.0-0.5.rc7
+- New upstream release
+
+* Sun Jan 22 2006 Roland Dreier <rolandd at cisco.com> - 1.0-0.4.rc6
+- New upstream release
+
+* Tue Oct 25 2005 Roland Dreier <rolandd at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
+* Wed Oct 5 2005 Roland Dreier <rolandd at cisco.com> - 1.0-0.2.rc4
+- Update to upstream 1.0-rc4 release
+
+* Mon Sep 26 2005 Roland Dreier <rolandd at cisco.com> - 1.0-0.1.rc3
+- Initial attempt at Fedora Extras-compliant spec file
More information about the general
mailing list