refresh

diff --git a/meta b/meta
index ffdb6715979c88d019a5131c4c46da930c8de587..3c13deed7c1c5e36f4e335158af5eb9905dd53f2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 93024db8fddc786e2ed931d159a2f8d90597542c
-Head: 57f1be934b010ead58f7f15c7e4c83b2a7bfd7c9
+Previous: 40f955abdea6e60dbd0e5cae9a86dbc4f13c3e14
+Head: 4801f885faea4ed70daa1b2d4b4644d51ca3dcdd
 Applied:
-  build-preload: edf7a87dbaa7ccfc4fd384cbaf40671283deb734
-  refresh-temp: 57f1be934b010ead58f7f15c7e4c83b2a7bfd7c9
+  build-preload: 4801f885faea4ed70daa1b2d4b4644d51ca3dcdd
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index f8e4441ad5ec4b44946be0a467824b839b29cf85..55905e42c867b5c86fdda6da9ed88ec812bc0025 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    33d02e70ba10ea30f1cdc845e1e0200a9eaea214
+Top:    05ed8795786ee984cd507b9a4687494434370278
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -16,14 +16,15 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..3f1280f 100644
+index 51b2f89..23d97f4 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,16 +1,20 @@
+@@ -1,16 +1,21 @@
  INCLUDES = -I$(srcdir)/include
  
++rslibdir = $(libdir)/rsocket
  lib_LTLIBRARIES = src/librdmacm.la
-+noinst_LTLIBRARIES  = src/librspreload.la
++rslibdir_LTLIBRARIES = src/librspreload.la
  
  ACLOCAL_AMFLAGS = -I config
  AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
@@ -40,18 +41,58 @@ index 51b2f89..3f1280f 100644
  endif
  
  src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \
-@@ -19,6 +23,11 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
+@@ -19,6 +24,12 @@ 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 \
 +                         $(librspreload_version_script)
++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 \
               examples/rdma_client examples/rdma_server examples/rdma_xclient \
               examples/rdma_xserver examples/rstream examples/rcopy
+@@ -116,7 +127,7 @@ man_MANS = \
+       man/rdma_cm.7 \
+       man/rsocket.7
+ 
+-EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \
++EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map src/librspreload.map \
+       librdmacm.spec.in $(man_MANS)
+ 
+ dist-hook: librdmacm.spec
+diff --git a/librdmacm.spec.in b/librdmacm.spec.in
+index 7248137..fe4ae97 100644
+--- a/librdmacm.spec.in
++++ b/librdmacm.spec.in
+@@ -44,6 +44,7 @@ rm -rf $RPM_BUILD_ROOT
+ %makeinstall
+ # remove unpackaged files from the buildroot
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
++rm -f $RPM_BUILD_ROOT%{_libdir}/rsocket/*.la
+ 
+ %clean
+ rm -rf $RPM_BUILD_ROOT
+@@ -53,13 +54,16 @@ rm -rf $RPM_BUILD_ROOT
+ 
+ %files
+ %defattr(-,root,root,-)
+-%{_libdir}/librdmacm*.so.*
++%{_libdir}/lib*.so.*
++%{_libdir}/rsocket/lib*.so.*
+ %doc AUTHORS COPYING README
+ 
+ %files devel
+ %defattr(-,root,root)
+ %{_libdir}/lib*.so
++%{_libdir}/rsocket/lib*.so
+ %{_libdir}/*.a
++%{_libdir}/rsocket/*.a
+ %{_includedir}/*
+ %{_mandir}/man3/*
+ %{_mandir}/man7/*
 diff --git a/src/librspreload.map b/src/librspreload.map
 new file mode 100644
 index 0000000..554050d

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 68907b0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,70 +0,0 @@
-Bottom: 33d02e70ba10ea30f1cdc845e1e0200a9eaea214
-Top:    05ed8795786ee984cd507b9a4687494434370278
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 12:01:39 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 3f1280f..23d97f4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,8 @@
- INCLUDES = -I$(srcdir)/include
- 
-+rslibdir = $(libdir)/rsocket
- lib_LTLIBRARIES = src/librdmacm.la
--noinst_LTLIBRARIES  = src/librspreload.la
-+rslibdir_LTLIBRARIES = src/librspreload.la
- 
- ACLOCAL_AMFLAGS = -I config
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
-@@ -26,6 +27,7 @@ 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 \
-                          $(librspreload_version_script)
-+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 \
-@@ -125,7 +127,7 @@ man_MANS = \
-       man/rdma_cm.7 \
-       man/rsocket.7
- 
--EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \
-+EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map src/librspreload.map \
-       librdmacm.spec.in $(man_MANS)
- 
- dist-hook: librdmacm.spec
-diff --git a/librdmacm.spec.in b/librdmacm.spec.in
-index 7248137..fe4ae97 100644
---- a/librdmacm.spec.in
-+++ b/librdmacm.spec.in
-@@ -44,6 +44,7 @@ rm -rf $RPM_BUILD_ROOT
- %makeinstall
- # remove unpackaged files from the buildroot
- rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-+rm -f $RPM_BUILD_ROOT%{_libdir}/rsocket/*.la
- 
- %clean
- rm -rf $RPM_BUILD_ROOT
-@@ -53,13 +54,16 @@ rm -rf $RPM_BUILD_ROOT
- 
- %files
- %defattr(-,root,root,-)
--%{_libdir}/librdmacm*.so.*
-+%{_libdir}/lib*.so.*
-+%{_libdir}/rsocket/lib*.so.*
- %doc AUTHORS COPYING README
- 
- %files devel
- %defattr(-,root,root)
- %{_libdir}/lib*.so
-+%{_libdir}/rsocket/lib*.so
- %{_libdir}/*.a
-+%{_libdir}/rsocket/*.a
- %{_includedir}/*
- %{_mandir}/man3/*
- %{_mandir}/man7/*