refresh

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

diff --git a/patches/daemonize b/patches/daemonize
index b238caa7df73c9c6d3cffa15455f8b64c4f12ff5..c65d7577db5574bf8a39220a8bcf72836e69928a 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    6b39402c3bb86b006ac6e534d358e1ca6561994a
+Top:    c75a63ed35d19ebbd46f0db013a471d4c891ecae
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -23,11 +23,14 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 503ad72..dea90f2 100644
+index 503ad72..966de5e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3,10 +3,10 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE
+@@ -1,12 +1,12 @@
+ 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/ib_acm
@@ -64,18 +67,6 @@ index 503ad72..dea90f2 100644
  
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
-diff --git a/configure.in b/configure.in
-index 736f657..8fd0570 100644
---- a/configure.in
-+++ b/configure.in
-@@ -58,6 +58,7 @@ 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/ibacm.init b/ibacm.init
 new file mode 100644
 index 0000000..8f863eb
@@ -301,17 +292,19 @@ similarity index 100%
 rename from acm_opts.cfg
 rename to ibacm_opts.cfg
 diff --git a/linux/osd.h b/linux/osd.h
-index 33ea842..f333d59 100644
+index 33ea842..943b719 100644
 --- a/linux/osd.h
 +++ b/linux/osd.h
-@@ -45,9 +45,9 @@
+@@ -45,9 +45,11 @@
  #include <sys/time.h>\r
  #include <netinet/in.h>\r
  \r
 -#define ACM_DEST_DIR "/etc/ibacm"\r
 -#define ACM_ADDR_FILE "acm_addr.cfg"\r
 -#define ACM_OPTS_FILE "acm_opts.cfg"\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
@@ -546,7 +539,7 @@ index f26ffb8..c0c63fc 100644
 -ib_acme(1), ib_acm(1)\r
 +ib_acme(1), ibacm(1)\r
 diff --git a/src/acm.c b/src/acm.c
-index 906c926..2a718b2 100644
+index 906c926..b992c8c 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -205,11 +205,11 @@ static atomic_t counter[ACM_MAX_COUNTER];
@@ -555,8 +548,8 @@ index 906c926..2a718b2 100644
   */
 -static char *opts_file = "/etc/ibacm/acm_opts.cfg";
 -static char *addr_file = "/etc/ibacm/acm_addr.cfg";
-+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/lock/ibacm.pid";
@@ -564,10 +557,31 @@ index 906c926..2a718b2 100644
  static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
  static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
  static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
+@@ -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 3d7461b..43e6dd9 100644
+index 3d7461b..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;
+ 
 @@ -69,7 +69,7 @@ extern char **parse(char *args, int *count);
  static void show_usage(char *program)
  {
@@ -577,7 +591,7 @@ index 3d7461b..43e6dd9 100644
        printf("   [-f addr_format] - i(p), n(ame), l(id), g(gid), or u(nspecified)\n");
        printf("                      address format for -s and -d options, default: 'u'\n");
        printf("   [-s src_addr]    - source address for path queries\n");
-@@ -79,10 +79,10 @@ static void show_usage(char *program)
+@@ -79,13 +79,13 @@ static void show_usage(char *program)
        printf("   [-P]             - query performance data from destination service\n");
        printf("   [-S svc_addr]    - address of ACM service, default: local service\n");
        printf("usage 2: %s\n", program);
@@ -589,7 +603,11 @@ index 3d7461b..43e6dd9 100644
 +      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", ACM_DEST_DIR);
++      printf("                      (default is %s)\n", SYSCONFDIR);
+       printf("   -V               - enable verbose output\n");
+ }
+ 
 @@ -94,7 +94,7 @@ static void gen_opts_temp(FILE *f)
        fprintf(f, "# InfiniBand Multicast Communication Manager for clusters configuration file\n");
        fprintf(f, "#\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7476a59..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,96 +0,0 @@
-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");
- }