refresh

diff --git a/meta b/meta
index d0056fcc7fb2bd65d06b98805c0bcb377738c7be..482d1466f8c372798ff0dd5a10575a10dd4ae13d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 450e4e530b7dd2b0c4fa23e9f51624f9fcf08e73
-Head: b563890f145bca730f5534dde7d479a2d8d7004d
+Previous: 1f1668ac34bdfd514de7d9a95c5cfaeefce5fc58
+Head: e90fdf7fc7a1f0a1068e625586808cd76baf3504
 Applied:
-  build-preload: 44954f203bb4a7e2365ced8af23c73c24065e13f
-  refresh-temp: b563890f145bca730f5534dde7d479a2d8d7004d
+  build-preload: e90fdf7fc7a1f0a1068e625586808cd76baf3504
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index ead45b01349419f123020c28bc962be730ec63f3..bd1e38edbc5a382759b3a909c4c5e5a5898fb63a 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    91153ae24e0243a1f3cf380e415d9bc5e8094789
+Top:    c076dedd7fc3859a921947137ceb8b57fa008eb2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -15,4 +15,30 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/Makefile.am b/Makefile.am
+index 51b2f89..b734d45 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,11 +1,12 @@
+ INCLUDES = -I$(srcdir)/include
+ 
+-lib_LTLIBRARIES = src/librdmacm.la
++lib_LTLIBRARIES = src/librdmacm.la src/rspreload.la
+ 
+ ACLOCAL_AMFLAGS = -I config
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
+ 
+ src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
++src_rspreload_la_CFLAGS = $(AM_CFLAGS) -shared -fPIC
+ 
+ if HAVE_LD_VERSION_SCRIPT
+     librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
+@@ -19,6 +20,8 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
+                          $(librdmacm_version_script)
+ src_librdmacm_la_DEPENDENCIES =  $(srcdir)/src/librdmacm.map
+ 
++src_rspreload_la_SOURCES = src/preload.c src/indexer.c
++
+ 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/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7787b23..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,36 +0,0 @@
-Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    c076dedd7fc3859a921947137ceb8b57fa008eb2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-09 15:40:28 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..b734d45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,11 +1,12 @@
- INCLUDES = -I$(srcdir)/include
- 
--lib_LTLIBRARIES = src/librdmacm.la
-+lib_LTLIBRARIES = src/librdmacm.la src/rspreload.la
- 
- ACLOCAL_AMFLAGS = -I config
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
- 
- src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
-+src_rspreload_la_CFLAGS = $(AM_CFLAGS) -shared -fPIC
- 
- if HAVE_LD_VERSION_SCRIPT
-     librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
-@@ -19,6 +20,8 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
-                          $(librdmacm_version_script)
- src_librdmacm_la_DEPENDENCIES =  $(srcdir)/src/librdmacm.map
- 
-+src_rspreload_la_SOURCES = src/preload.c src/indexer.c
-+
- 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