refresh

diff --git a/meta b/meta
index e9a16243a87245e2e2db8069492ef2d06d7ec916..ce2f8ae6acbdfba6b033e7949c87d2a189053cea 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 9bb4c6bf67818a9e07de975fde2836d9f6fd134c
-Head: 791c722c5960724b1a2a6ecc950de58c85669dad
+Previous: 42f4b743ca5d19166c980ffbd726e4de557209b8
+Head: 5e6d3e4014c0a1a5f94e41301d8e0511b4ddae3c
 Applied:
-  build-preload: 082b07a9c18b9a9b42dac7fbb9afc544e7614a87
-  refresh-temp: 791c722c5960724b1a2a6ecc950de58c85669dad
+  build-preload: 5e6d3e4014c0a1a5f94e41301d8e0511b4ddae3c
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index 101627862af4b86f7b07172166f5e74fbe888c1d..55c3d6afead665f5734d521b58c58554fffe2492 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    e8a593c3ff191ffcaccc9621780345523eb869d8
+Top:    a28f53d18ae8ac8f9c8e4b58b003388a6498d969
 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..064bd1f 100644
+index 51b2f89..62f0a63 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,16 +1,21 @@
@@ -29,7 +29,7 @@ index 51b2f89..064bd1f 100644
  AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
  
  src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
-+src_librspreload_la_CFLAGS = $(AM_CFLAGS)
++src_librspreload_la_CFLAGS = -Wall -shared -fPIC -D_GNU_SOURCE
  
  if HAVE_LD_VERSION_SCRIPT
      librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2657310..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: e8a593c3ff191ffcaccc9621780345523eb869d8
-Top:    a28f53d18ae8ac8f9c8e4b58b003388a6498d969
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 13:23:42 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 064bd1f..62f0a63 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I config
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
- 
- src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
--src_librspreload_la_CFLAGS = $(AM_CFLAGS)
-+src_librspreload_la_CFLAGS = -Wall -shared -fPIC -D_GNU_SOURCE
- 
- if HAVE_LD_VERSION_SCRIPT
-     librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map