refresh

diff --git a/meta b/meta
index 358d3f2f26ef546f6a07a16351e0a3aa6710cfe9..d5ab211e85e926e30bb15f2aa1953300f5236d36 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 998ef31f41a0ad8b3fcf59bf997d3923917afd88
-Head: 085c16438c5ebcbed141d25b493ce7b9d06085ee
+Previous: f6da4aff7c9a0986c2a4cd7d95f0078766936400
+Head: 4bcc8d3c74a2f12c5e379a6e3892dbbc6b1630d0
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 4a9f7d6d6affdf1a8f9eee142c92aa06d37ceca9
-  refresh-temp: 085c16438c5ebcbed141d25b493ce7b9d06085ee
+  daemonize: 4bcc8d3c74a2f12c5e379a6e3892dbbc6b1630d0
 Unapplied:
   rel-1.0.6: 8e4b688d3bd9e1229a0af043432b41e954292f74
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index bd22242f6f05519e3724b9478f5da5b9271f2a36..2744a29d4efc0491ab674f8b806215e9a36a4097 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    f1d60133c917c51b6a2e5412d02e961bac10d966
+Top:    bf622b57f0b0cd063ba351dea3e4eac4a8de301f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -23,14 +23,14 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 503ad72..96a4514 100644
+index 503ad72..d3d08b2 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -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}\"
++AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\"
  
  bin_PROGRAMS = util/ib_acme
 -sbin_PROGRAMS = svc/ib_acm
@@ -297,10 +297,10 @@ 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..3c66761 100644
+index 33ea842..c2360f3 100644
 --- a/linux/osd.h
 +++ b/linux/osd.h
-@@ -45,9 +45,11 @@
+@@ -45,9 +45,14 @@
  #include <sys/time.h>\r
  #include <netinet/in.h>\r
  \r
@@ -310,6 +310,9 @@ index 33ea842..3c66761 100644
 +#ifndef SYSCONFDIR\r
 +#define SYSCONFDIR "/etc/rdma"\r
 +#endif\r
++#ifndef BINDIR\r
++#define BINDIR "/usr/bin"\r
++#endif\r
 +#define ACM_ADDR_FILE "ibacm_addr.cfg"\r
 +#define ACM_OPTS_FILE "ibacm_opts.cfg"\r
  \r
@@ -544,15 +547,16 @@ 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..39c0369 100644
+index 906c926..79b0976 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -205,11 +205,11 @@ static atomic_t counter[ACM_MAX_COUNTER];
+@@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER];
  /*
   * Service options - may be set through acm_opts file.
   */
 -static char *opts_file = "/etc/ibacm/acm_opts.cfg";
 -static char *addr_file = "/etc/ibacm/acm_addr.cfg";
++static char *acme = BINDIR "/ib_acme -A"
 +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";
@@ -562,19 +566,20 @@ index 906c926..39c0369 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;
-@@ -2507,9 +2507,9 @@ static FILE *acm_open_addr_file(void)
+@@ -2507,9 +2508,9 @@ static FILE *acm_open_addr_file(void)
        if ((f = fopen(addr_file, "r")))
                return f;
  
 -      acm_log(0, "notice - generating acm_addr.cfg file\n");
-+      acm_log(0, "notice - generating %s file\n", addr_file);
-       if (!(f = popen("ib_acme -A", "r"))) {
+-      if (!(f = popen("ib_acme -A", "r"))) {
 -              acm_log(0, "ERROR - cannot generate acm_addr.cfg\n");
++      acm_log(0, "notice - generating %s file\n", addr_file);
++      if (!(f = popen(acme, "r"))) {
 +              acm_log(0, "ERROR - cannot generate %s\n", addr_file);
                return NULL;
        }
        pclose(f);
-@@ -3156,9 +3156,9 @@ static void show_usage(char *program)
+@@ -3156,9 +3157,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");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 42a3c45..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,56 +0,0 @@
-Bottom: f1d60133c917c51b6a2e5412d02e961bac10d966
-Top:    bf622b57f0b0cd063ba351dea3e4eac4a8de301f
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-04-02 17:24:06 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 96a4514..d3d08b2 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}\"
-+AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\"
- 
- bin_PROGRAMS = util/ib_acme
- sbin_PROGRAMS = svc/ibacm
-diff --git a/linux/osd.h b/linux/osd.h
-index 3c66761..c2360f3 100644
---- a/linux/osd.h
-+++ b/linux/osd.h
-@@ -48,6 +48,9 @@
- #ifndef SYSCONFDIR\r
- #define SYSCONFDIR "/etc/rdma"\r
- #endif\r
-+#ifndef BINDIR\r
-+#define BINDIR "/usr/bin"\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 39c0369..79b0976 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -205,6 +205,7 @@ static atomic_t counter[ACM_MAX_COUNTER];
- /*
-  * Service options - may be set through acm_opts file.
-  */
-+static char *acme = BINDIR "/ib_acme -A"
- 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";
-@@ -2508,7 +2509,7 @@ static FILE *acm_open_addr_file(void)
-               return f;
- 
-       acm_log(0, "notice - generating %s file\n", addr_file);
--      if (!(f = popen("ib_acme -A", "r"))) {
-+      if (!(f = popen(acme, "r"))) {
-               acm_log(0, "ERROR - cannot generate %s\n", addr_file);
-               return NULL;
-       }