refresh

diff --git a/meta b/meta
index 83699fd4c7461689bfa3241cfc55fa3234312f83..2206018120162b56965191e61b917695970b9413 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 8e1f7fe77cbdb4a6888dc4c9d3a0220bc4b70d82
-Head: 9d591e35467ecf6b3c4bf54b8fde665a0fcd16fa
+Previous: 025f5b854d660d5ccf2bacf80476f2a19d3df701
+Head: 7d5fcaa40a63b04164c2910a37c807df306797b1
 Applied:
-  build-preload: 019c5fe4678f06b7f54ae83ee993707a15d417bf
-  refresh-temp: 9d591e35467ecf6b3c4bf54b8fde665a0fcd16fa
+  build-preload: 7d5fcaa40a63b04164c2910a37c807df306797b1
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index 305e71eded4b02e05d15f8f7994b64a116787ffc..588ae4a871a3dd9429af638e9d9121110ae26e7b 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    00e1df4bcbc33b38df0e85b87fbbabd2da64d772
+Top:    1156af15371b9307f7a9cf12d291ba35e3e631c6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -16,14 +16,14 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..901e8ee 100644
+index 51b2f89..9bf6070 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,11 +1,12 @@
+@@ -1,11 +1,13 @@
  INCLUDES = -I$(srcdir)/include
  
--lib_LTLIBRARIES = src/librdmacm.la
-+lib_LTLIBRARIES = src/librdmacm.la src/librspreload.la
+ lib_LTLIBRARIES = src/librdmacm.la
++noinst_LTLIBRARIES  = src/librspreload.la
  
  ACLOCAL_AMFLAGS = -I config
  AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
@@ -33,7 +33,7 @@ index 51b2f89..901e8ee 100644
  
  if HAVE_LD_VERSION_SCRIPT
      librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
-@@ -19,6 +20,9 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
+@@ -19,6 +21,9 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
                           $(librdmacm_version_script)
  src_librdmacm_la_DEPENDENCIES =  $(srcdir)/src/librdmacm.map
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 469b681..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 00e1df4bcbc33b38df0e85b87fbbabd2da64d772
-Top:    1156af15371b9307f7a9cf12d291ba35e3e631c6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-09 17:19:03 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 901e8ee..9bf6070 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,7 @@
- INCLUDES = -I$(srcdir)/include
- 
--lib_LTLIBRARIES = src/librdmacm.la src/librspreload.la
-+lib_LTLIBRARIES = src/librdmacm.la
-+noinst_LTLIBRARIES  = src/librspreload.la
- 
- ACLOCAL_AMFLAGS = -I config
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"