refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..68907b0
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,70 @@
+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/*