refresh (create temporary patch)

diff --git a/meta b/meta
index 8a782fc234d9bf3fe4ab36754a3325ec4c57f6cd..ef6331d34ad97a89160d1ac4e6541bf998cfee40 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 273a7655e91683a52abc3d652533ffc7fbdfb8bf
-Head: 54027239520dd4d42cb15a2b21aa21e813f897e0
+Previous: 03dab7a484cdd97e6655e25c32e0c3b04ac176a2
+Head: dea5650810bc965c38f17c40d1427d43b134c85f
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   daemonize: 54027239520dd4d42cb15a2b21aa21e813f897e0
+  refresh-temp: dea5650810bc965c38f17c40d1427d43b134c85f
 Unapplied:
   rel-1.0.6: 51d763ab578426846cf2af4df006aad7ef5d71eb
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..7476a59
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,96 @@
+Bottom: 6b39402c3bb86b006ac6e534d358e1ca6561994a
+Top:    c75a63ed35d19ebbd46f0db013a471d4c891ecae
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-04-02 15:24:11 -0700
+
+Refresh of daemonize
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index dea90f2..966de5e 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
++AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\"
+ 
+ bin_PROGRAMS = util/ib_acme
+ sbin_PROGRAMS = svc/ibacm
+diff --git a/configure.in b/configure.in
+index 8fd0570..736f657 100644
+--- a/configure.in
++++ b/configure.in
+@@ -58,7 +58,6 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
+     fi)\r
+ \r
+ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")\r
+-AC_DEFINE(ACM_DEST_DIR, $sysconfdir, [setting configuration directory])\r
+ \r
+ AC_CONFIG_FILES([Makefile ibacm.spec])\r
+ AC_OUTPUT\r
+diff --git a/linux/osd.h b/linux/osd.h
+index f333d59..943b719 100644
+--- a/linux/osd.h
++++ b/linux/osd.h
+@@ -45,7 +45,9 @@
+ #include <sys/time.h>\r
+ #include <netinet/in.h>\r
+ \r
+-// #define ACM_DEST_DIR "/etc/rdma"\r
++#ifndef SYSCONFDIR\r
++#define SYSCONFDIR "\etc\rdma"\r
++#endif\r
+ #define ACM_ADDR_FILE "ibacm_addr.cfg"\r
+ #define ACM_OPTS_FILE "ibacm_opts.cfg"\r
+ \r
+diff --git a/src/acm.c b/src/acm.c
+index 2a718b2..b992c8c 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -205,8 +205,8 @@ static atomic_t counter[ACM_MAX_COUNTER];
+ /*
+  * Service options - may be set through acm_opts file.
+  */
+-static char *opts_file = ACM_DEST_DIR "/" ACM_OPTS_FILE;
+-static char *addr_file = ACM_DEST_DIR "/" ACM_ADDR_FILE;
++static char *opts_file = SYSCONFDIR "/" ACM_OPTS_FILE;
++static char *addr_file = SYSCONFDIR "/" ACM_ADDR_FILE;
+ static char log_file[128] = "/var/log/ibacm.log";
+ static int log_level = 0;
+ static char lock_file[128] = "/var/run/ibacm.pid";
+@@ -3156,9 +3156,9 @@ static void show_usage(char *program)
+       printf("   [-D]             - run as a daemon (default)\n");
+       printf("   [-P]             - run as a standard process\n");
+       printf("   [-A addr_file]   - address configuration file\n");
+-      printf("                      (default %s/%s\n", ACM_DEST_DIR, ACM_ADDR_FILE);
++      printf("                      (default %s/%s\n", SYSCONFDIR, ACM_ADDR_FILE);
+       printf("   [-O option_file] - option configuration file\n");
+-      printf("                      (default %s/%s\n", ACM_DEST_DIR, ACM_OPTS_FILE);
++      printf("                      (default %s/%s\n", SYSCONFDIR, ACM_OPTS_FILE);
+ }
+ 
+ int CDECL_FUNC main(int argc, char **argv)
+diff --git a/src/acme.c b/src/acme.c
+index 43e6dd9..94ff710 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -43,7 +43,7 @@
+ #include <infiniband/acm.h>
+ #include "libacm.h"
+ 
+-static char *dest_dir = ACM_DEST_DIR;
++static char *dest_dir = SYSCONFDIR;
+ static char *addr_file = ACM_ADDR_FILE;
+ static char *opts_file = ACM_OPTS_FILE;
+ 
+@@ -85,7 +85,7 @@ static void show_usage(char *program)
+       printf("   -O [opt_file]    - generate local ibacm_opts.cfg options file\n");
+       printf("                      (default is %s)\n", ACM_OPTS_FILE);
+       printf("   -D dest_dir      - specify destination directory for output files\n");
+-      printf("                      (default is %s)\n", ACM_DEST_DIR);
++      printf("                      (default is %s)\n", SYSCONFDIR);
+       printf("   -V               - enable verbose output\n");
+ }