commit

diff --git a/meta b/meta
index b10ef14ac840561a0177a4e81388e399d453ce2c..16b527873eb53e9fbd4429e3ac29411d7aa0cf24 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,7 @@
 Version: 1
-Previous: 805b0c1c7cc979b7d8d11b4d5b9d028f5c5080d8
+Previous: fad6dee0b780435f73af8d69f12bc2e2bef68a5d
 Head: e438f45a787a430edf943a741886b009737c032a
 Applied:
-  build-preload: 934949885dc5db0c30a70378b7fc8c36d512e32f
-  chk-src: 229f421a77066a61d6465cc6960b5fb914099ce3
-  inc-common-h: c55f559bcc853ee9b1bb86c6793030394393d6fa
-  v1.0.16: e438f45a787a430edf943a741886b009737c032a
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
deleted file mode 100644 (file)
index 5c2f799..0000000
--- a/patches/build-preload
+++ /dev/null
@@ -1,96 +0,0 @@
-Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    220121d634269cc5dec0c0d7bc1545acc1e3b8a9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-09 14:58:14 -0700
-
-rsocket: Build librspreload library as part of build
-
-Build the rsocket preload library as part of the build.  To reduce the
-risk of the preload library intercepting calls without the user's
-knowledge, the preload library is installed into {_libdir}/rsocket.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..b271b45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,11 +1,14 @@
- INCLUDES = -I$(srcdir)/include
- 
-+rslibdir = $(libdir)/rsocket
- lib_LTLIBRARIES = src/librdmacm.la
-+rslib_LTLIBRARIES = src/librspreload.la
- 
- ACLOCAL_AMFLAGS = -I config
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
- 
- src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
-+src_librspreload_la_CFLAGS = $(AM_CFLAGS)
- 
- if HAVE_LD_VERSION_SCRIPT
-     librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
-@@ -19,6 +22,10 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
-                          $(librdmacm_version_script)
- src_librdmacm_la_DEPENDENCIES =  $(srcdir)/src/librdmacm.map
- 
-+src_librspreload_la_SOURCES = src/preload.c src/indexer.c
-+src_librspreload_la_LDFLAGS = -version-info 1 -export-dynamic
-+src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
-+
- bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \
-              examples/rdma_client examples/rdma_server examples/rdma_xclient \
-              examples/rdma_xserver examples/rstream examples/rcopy
-diff --git a/librdmacm.spec.in b/librdmacm.spec.in
-index 7248137..4652bbc 100644
---- a/librdmacm.spec.in
-+++ b/librdmacm.spec.in
-@@ -44,6 +44,7 @@ rm -rf $RPM_BUILD_ROOT
- %makeinstall
- # remove unpackaged files from the buildroot
- rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-+rm -f $RPM_BUILD_ROOT%{_libdir}/rsocket/*.la
- 
- %clean
- rm -rf $RPM_BUILD_ROOT
-@@ -53,13 +54,16 @@ rm -rf $RPM_BUILD_ROOT
- 
- %files
- %defattr(-,root,root,-)
--%{_libdir}/librdmacm*.so.*
-+%{_libdir}/lib*.so.*
-+%{_libdir}/rsocket/lib*.so.*
- %doc AUTHORS COPYING README
- 
- %files devel
- %defattr(-,root,root)
--%{_libdir}/lib*.so
-+%{_libdir}/librdmacm*.so
-+%{_libdir}/rsocket/librspreload*.so
- %{_libdir}/*.a
-+%{_libdir}/rsocket/*.a
- %{_includedir}/*
- %{_mandir}/man3/*
- %{_mandir}/man7/*
-diff --git a/src/preload.c b/src/preload.c
-index d21389f..8758d5c 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -31,14 +31,6 @@
-  *
-  */
- 
--/*
-- * Build:
-- * gcc -lrdmacm -Wall -shared -fPIC -o preload.so -D_GNU_SOURCE preload.c indexer.c
-- *
-- * Use:
-- * LD_PRELOAD=preload.so binary --plus_args
-- */
--
- #if HAVE_CONFIG_H
- #  include <config.h>
- #endif /* HAVE_CONFIG_H */

diff --git a/patches/chk-src b/patches/chk-src
deleted file mode 100644 (file)
index 4d9091e..0000000
--- a/patches/chk-src
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: 220121d634269cc5dec0c0d7bc1545acc1e3b8a9
-Top:    dfec70d648229122a223c74fd6c162bb7057df14
-Author: Yann Droneaud <ydroneaud@opteya.com>
-Date:   2012-07-11 11:54:39 -0700
-
-librdmacm: Validate source address protocol family in rdma_resolve_addr
-
-If a source address is provided but its protocol family is not recognized,
-returns an error.
-
-Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index f688c4c..86dd787 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -811,6 +811,9 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
-               return ERR(EINVAL);
- 
-       src_len = ucma_addrlen(src_addr);
-+      if (src_addr && !src_len)
-+              return ERR(EINVAL);
-+
-       if (af_ib_support)
-               return rdma_resolve_addr2(id, src_addr, src_len, dst_addr,
-                                         dst_len, timeout_ms);

diff --git a/patches/inc-common-h b/patches/inc-common-h
deleted file mode 100644 (file)
index 0be62ad..0000000
--- a/patches/inc-common-h
+++ /dev/null
@@ -1,28 +0,0 @@
-Bottom: dfec70d648229122a223c74fd6c162bb7057df14
-Top:    31af2c38b30cc7004b87c3d8c3adf4afc84f8df4
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-07-11 12:39:08 -0700
-
-librdmacm: Include src/common.h in distribution
-
-Add missing header file to distribution to allow rpmbuild to
-work.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index b271b45..4a8b9bc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -124,7 +124,7 @@ man_MANS = \
-       man/rsocket.7
- 
- EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \
--      librdmacm.spec.in $(man_MANS)
-+      examples/common.h librdmacm.spec.in $(man_MANS)
- 
- dist-hook: librdmacm.spec
-       cp librdmacm.spec $(distdir)

diff --git a/patches/v1.0.16 b/patches/v1.0.16
deleted file mode 100644 (file)
index 7d5d00c..0000000
--- a/patches/v1.0.16
+++ /dev/null
@@ -1,43 +0,0 @@
-Bottom: 31af2c38b30cc7004b87c3d8c3adf4afc84f8df4
-Top:    26c72fc7d78b6e5a8bd310bba173294a9fec381d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 17:55:32 -0700
-
-v1.0.16
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/configure.in b/configure.in
-index 3ee7f9b..d4434c2 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,12 +1,12 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- AC_PREREQ(2.57)
--AC_INIT(librdmacm, 1.0.15, linux-rdma@vger.kernel.org)
-+AC_INIT(librdmacm, 1.0.16, linux-rdma@vger.kernel.org)
- AC_CONFIG_SRCDIR([src/cma.c])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
- AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE(librdmacm, 1.0.15)
-+AM_INIT_AUTOMAKE(librdmacm, 1.0.16)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- AM_PROG_LIBTOOL
-diff --git a/librdmacm.spec.in b/librdmacm.spec.in
-index 4652bbc..575ce84 100644
---- a/librdmacm.spec.in
-+++ b/librdmacm.spec.in
-@@ -1,7 +1,7 @@
- %define ver @VERSION@
- 
- Name: librdmacm
--Version: 1.0.15
-+Version: 1.0.16
- Release: 1%{?dist}
- Summary: Userspace RDMA Connection Manager