refresh

diff --git a/meta b/meta
index 073d1517520866f489b69172e12009fe09903904..7bb6666c5e50664c78c5096c3374fe9ec15c655d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 3518d9e0b7009ed6ae4885a03e18a1bd7e0fa08a
-Head: 45dd87e95cbdc3d1d6ad91b777784a5485d420d8
+Previous: aee19ed0d5ca1f21ceb241e0aa1d539ee50d43be
+Head: f580a10d102abe35a838e57b08781cc6696dd261
 Applied:
-  build-preload: 54695d4a26cb90b1f65ed8a97a28e83bb5c45081
-  refresh-temp: 45dd87e95cbdc3d1d6ad91b777784a5485d420d8
+  build-preload: f580a10d102abe35a838e57b08781cc6696dd261
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index 2b32f8797ac3c023628af77c87bb13700adceb82..6b75e7d0a5b3cb8933a8ace96dd9fda249e5aad8 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    c64a76f16b2f730e7c7514ef9ef676f4e60f07e0
+Top:    fa0afbb920504a794165a458b584e32efebb3ce6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -15,10 +15,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..e01b4cc 100644
+index 51b2f89..581cded 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,16 +1,21 @@
+@@ -1,11 +1,14 @@
  INCLUDES = -I$(srcdir)/include
  
 +rslibdir = $(libdir)/rsocket
@@ -33,35 +33,18 @@ index 51b2f89..e01b4cc 100644
  
  if HAVE_LD_VERSION_SCRIPT
      librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
-+    librspreload_version_script =
- else
-     librdmacm_version_script =
-+    librspreload_version_script =
- endif
- 
- src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \
-@@ -19,6 +24,12 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
+@@ -19,6 +22,11 @@ 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 \
-+                         $(librspreload_version_script)
++src_librspreload_la_LDFLAGS = -version-info 1 -export-dynamic
 +src_librspreload_la_DEPENDENCIES =  $(srcdir)/src/librspreload.map
 +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
-@@ -116,7 +127,7 @@ man_MANS = \
-       man/rdma_cm.7 \
-       man/rsocket.7
- 
--EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \
-+EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map src/librspreload.map \
-       librdmacm.spec.in $(man_MANS)
- 
- dist-hook: librdmacm.spec
 diff --git a/librdmacm.spec.in b/librdmacm.spec.in
 index 7248137..4652bbc 100644
 --- a/librdmacm.spec.in
@@ -93,42 +76,6 @@ index 7248137..4652bbc 100644
  %{_includedir}/*
  %{_mandir}/man3/*
  %{_mandir}/man7/*
-diff --git a/src/librspreload.map b/src/librspreload.map
-new file mode 100644
-index 0000000..554050d
---- /dev/null
-+++ b/src/librspreload.map
-@@ -0,0 +1,30 @@
-+RSPRELOAD_1.0 {
-+      global:
-+              socket;
-+              bind;
-+              listen;
-+              accept;
-+              connect;
-+              shutdown;
-+              close;
-+              recv;
-+              recvfrom;
-+              recvmsg;
-+              send;
-+              sendto;
-+              sendmsg;
-+              read;
-+              readv;
-+              write;
-+              writev;
-+              poll;
-+              select;
-+              getpeername;
-+              getsockname;
-+              setsockopt;
-+              getsockopt;
-+              fcntl;
-+              poll;
-+              select;
-+      local: *;
-+};
 diff --git a/src/preload.c b/src/preload.c
 index d21389f..8758d5c 100644
 --- a/src/preload.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a2fd922..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,79 +0,0 @@
-Bottom: c64a76f16b2f730e7c7514ef9ef676f4e60f07e0
-Top:    fa0afbb920504a794165a458b584e32efebb3ce6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 17:45:33 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index e01b4cc..581cded 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,10 +12,8 @@ src_librspreload_la_CFLAGS = $(AM_CFLAGS)
- 
- if HAVE_LD_VERSION_SCRIPT
-     librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
--    librspreload_version_script =
- else
-     librdmacm_version_script =
--    librspreload_version_script =
- endif
- 
- src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \
-@@ -25,8 +23,7 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
- 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 \
--                         $(librspreload_version_script)
-+src_librspreload_la_LDFLAGS = -version-info 1 -export-dynamic
- src_librspreload_la_DEPENDENCIES =  $(srcdir)/src/librspreload.map
- src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
- 
-@@ -127,7 +124,7 @@ man_MANS = \
-       man/rdma_cm.7 \
-       man/rsocket.7
- 
--EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map src/librspreload.map \
-+EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \
-       librdmacm.spec.in $(man_MANS)
- 
- dist-hook: librdmacm.spec
-diff --git a/src/librspreload.map b/src/librspreload.map
-deleted file mode 100644
-index 554050d..0000000
---- a/src/librspreload.map
-+++ /dev/null
-@@ -1,30 +0,0 @@
--RSPRELOAD_1.0 {
--      global:
--              socket;
--              bind;
--              listen;
--              accept;
--              connect;
--              shutdown;
--              close;
--              recv;
--              recvfrom;
--              recvmsg;
--              send;
--              sendto;
--              sendmsg;
--              read;
--              readv;
--              write;
--              writev;
--              poll;
--              select;
--              getpeername;
--              getsockname;
--              setsockopt;
--              getsockopt;
--              fcntl;
--              poll;
--              select;
--      local: *;
--};