refresh (create temporary patch)

diff --git a/meta b/meta
index cbb6528577cb8d72b9db22d37b8c39eb82d25c68..400314e9e21e87346bbfb697cd1bd3db7979a913 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 4b2e0dd8d649b136c8b9daca5d0db7a1c368c7df
-Head: d70f9fce693834c1790a5a5f4716bb927fdff672
+Previous: 94dade383897a7fe31934362e993952be8640fd9
+Head: eee41d0606a288262e75ca7e1d206082dfd3b48c
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   daemonize: d70f9fce693834c1790a5a5f4716bb927fdff672
+  refresh-temp: eee41d0606a288262e75ca7e1d206082dfd3b48c
 Unapplied:
   rel-1.0.6: 0dbad19fe25be12e172cfad296743d831c772845
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..b866dfb
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,58 @@
+Bottom: 744c795c98f620a23e0aa15ac32d34544c4b3bfc
+Top:    02a7ddba0858aa80834d5be75b61dc491a3f534b
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-04-05 11:31:28 -0700
+
+Refresh of daemonize
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 875889a..c5efa7c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
+ 
+-AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\"
++AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\" -DRDMADIR=\"${rdmadir}\"
+ 
+ bin_PROGRAMS = util/ib_acme
+ sbin_PROGRAMS = svc/ibacm
+@@ -23,7 +23,7 @@ EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init \
+            ibacm_addr.cfg
+ 
+ install-exec-hook:
+-      install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd;
++      install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm;
+ 
+ dist-hook: ibacm.spec
+       cp ibacm.spec $(distdir)
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index ee7d187..88dad4f 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -47,7 +47,7 @@ wish to make use of this header file.
+ %build
+ aclocal -I config && libtoolize --force --copy && autoheader && \
+       automake --foreign --add-missing --copy && autoconf
+-%configure --rdmadir=rdma CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS=-lpthread
++%configure CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS=-lpthread
+ make %{?_smp_mflags}
+ 
+ %install
+diff --git a/linux/osd.h b/linux/osd.h
+index 169e041..e2424b4 100644
+--- a/linux/osd.h
++++ b/linux/osd.h
+@@ -51,7 +51,10 @@
+ #ifndef BINDIR\r
+ #define BINDIR "/usr/bin"\r
+ #endif\r
+-#define ACM_CONF_DIR  SYSCONFDIR "/rdma"\r
++#ifndef RDMADIR\r
++#define RDMADIR "rdma"\r
++#endif\r
++#define ACM_CONF_DIR  SYSCONFDIR "/" RDMADIR\r
+ #define ACM_ADDR_FILE "ibacm_addr.cfg"\r
+ #define ACM_OPTS_FILE "ibacm_opts.cfg"