refresh

diff --git a/meta b/meta
index 79fd24c3b6c2f98cc8e643c091d7183aad8df75d..5c70239d4d88520886ecfc55b99049ac8f68f3fa 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 1c9998292d81625df67c86d0a811820b0d749637
-Head: 78992c1aa6738aee6361d524bb2c15baa611e542
+Previous: 876b4bd1986be1199cf1301c657511caaa53dc1c
+Head: 934949885dc5db0c30a70378b7fc8c36d512e32f
 Applied:
-  build-preload: f580a10d102abe35a838e57b08781cc6696dd261
-  refresh-temp: 78992c1aa6738aee6361d524bb2c15baa611e542
+  build-preload: 934949885dc5db0c30a70378b7fc8c36d512e32f
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index 6b75e7d0a5b3cb8933a8ace96dd9fda249e5aad8..5c2f799228d147dd1132de66db0b915623629434 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    fa0afbb920504a794165a458b584e32efebb3ce6
+Top:    220121d634269cc5dec0c0d7bc1545acc1e3b8a9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..581cded 100644
+index 51b2f89..b271b45 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,11 +1,14 @@
@@ -33,13 +33,12 @@ index 51b2f89..581cded 100644
  
  if HAVE_LD_VERSION_SCRIPT
      librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
-@@ -19,6 +22,11 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
+@@ -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_DEPENDENCIES =  $(srcdir)/src/librspreload.map
 +src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
 +
  bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8572232..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: fa0afbb920504a794165a458b584e32efebb3ce6
-Top:    220121d634269cc5dec0c0d7bc1545acc1e3b8a9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 17:51:33 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 581cded..b271b45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,7 +24,6 @@ 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_DEPENDENCIES =  $(srcdir)/src/librspreload.map
- src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
- 
- bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \