refresh

diff --git a/meta b/meta
index 0f709e8aa32e27cf5ba066ef648a2a4534faa23a..ccf09956b962bb00789e94e517f96557cf1de431 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: ca942c429a2cba474bfb386794099dd294179ee2
-Head: 35383dcd2e9fb91594df919f812edb42dc8e0a04
+Previous: 55cd5b5bcf1e2d64f359a9357c946dba897516cb
+Head: 9c030464265750897a42592f352911f79de0b650
 Applied:
-  build-preload: 9953927e2ba662867fb28d2147c6bca10883689b
-  refresh-temp: 35383dcd2e9fb91594df919f812edb42dc8e0a04
+  build-preload: 9c030464265750897a42592f352911f79de0b650
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index c848c6f40a309378f7a14f9919ed29317ff92429..6b2b8cd8e5da04cc7fb4584c9296acf676ac7a17 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    50465fe288254c5dcda8e29f166d42b7cdbb4d2d
+Top:    e8a593c3ff191ffcaccc9621780345523eb869d8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..23d97f4 100644
+index 51b2f89..064bd1f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,16 +1,21 @@
@@ -24,7 +24,7 @@ index 51b2f89..23d97f4 100644
  
 +rslibdir = $(libdir)/rsocket
  lib_LTLIBRARIES = src/librdmacm.la
-+rslibdir_LTLIBRARIES = src/librspreload.la
++rslib_LTLIBRARIES = src/librspreload.la
  
  ACLOCAL_AMFLAGS = -I config
  AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3126a44..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 50465fe288254c5dcda8e29f166d42b7cdbb4d2d
-Top:    e8a593c3ff191ffcaccc9621780345523eb869d8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 12:19:42 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 23d97f4..064bd1f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/include
- 
- rslibdir = $(libdir)/rsocket
- lib_LTLIBRARIES = src/librdmacm.la
--rslibdir_LTLIBRARIES = src/librspreload.la
-+rslib_LTLIBRARIES = src/librspreload.la
- 
- ACLOCAL_AMFLAGS = -I config
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"