refresh (create temporary patch)

diff --git a/meta b/meta
index 2206018120162b56965191e61b917695970b9413..9974758f475ef49261855ad38ac1f55579d639f0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 025f5b854d660d5ccf2bacf80476f2a19d3df701
-Head: 7d5fcaa40a63b04164c2910a37c807df306797b1
+Previous: 7ec2c36d645a44bdadb39d523bd0a98c4981bc74
+Head: 3fca9cdeb3c5e2740c4db699b4dd88655cf958cc
 Applied:
   build-preload: 7d5fcaa40a63b04164c2910a37c807df306797b1
+  refresh-temp: 3fca9cdeb3c5e2740c4db699b4dd88655cf958cc
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..2b52f9f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,69 @@
+Bottom: 1156af15371b9307f7a9cf12d291ba35e3e631c6
+Top:    33d02e70ba10ea30f1cdc845e1e0200a9eaea214
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-09 17:35:37 -0700
+
+Refresh of build-preload
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 9bf6070..3f1280f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,8 +11,10 @@ src_librspreload_la_CFLAGS = $(AM_CFLAGS)
+ 
+ if HAVE_LD_VERSION_SCRIPT
+     librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
++    librspreload_version_script = -Wl,--version-script=$(srcdir)/src/librspreload.map
+ else
+     librdmacm_version_script =
++    librspreload_version_script =
+ endif
+ 
+ src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \
+@@ -22,6 +24,8 @@ 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_LIBADD = $(top_builddir)/src/librdmacm.la
+ 
+ bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \
+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: *;
++};