From b3030521bcfb13559d97de4cb45ccc44aec12383 Mon Sep 17 00:00:00 2001 From: "sean.hefty@intel.com" Date: Tue, 3 Apr 2012 11:38:12 -0700 Subject: [PATCH] refresh --- meta | 7 ++-- patches/daemonize | 32 +++++++++------- patches/refresh-temp | 89 -------------------------------------------- 3 files changed, 21 insertions(+), 107 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 79c193c..2dca7b7 100644 --- a/meta +++ b/meta @@ -1,10 +1,9 @@ Version: 1 -Previous: 641cf0560c0b2285c2bb5d159ea90570721ac9a6 -Head: 63f69b9ccb37f95ff628b95cd4e1ea6e6bcf0c00 +Previous: b6542135c769eccd5ef04836306dba89ede6fe53 +Head: c1a4e991a8edea7432c227258322c1480066328b Applied: af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c - daemonize: 4c2c0c0ee997fbb00b928cfd471606c2d6209613 - refresh-temp: 63f69b9ccb37f95ff628b95cd4e1ea6e6bcf0c00 + daemonize: c1a4e991a8edea7432c227258322c1480066328b Unapplied: rel-1.0.6: 22e4425b34449aaba064c5dd2f726aff95faca73 dev-name2ip: 8e00708e882239292492e13aa51c82042255933c diff --git a/patches/daemonize b/patches/daemonize index 2d01510..a7fc726 100644 --- a/patches/daemonize +++ b/patches/daemonize @@ -1,5 +1,5 @@ Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906 -Top: 56f2c285e9a48bd5f17f10c897f8f459b10cd403 +Top: 5845b20997dda75dd9baf21235ec37582f2e3321 Author: Sean Hefty Date: 2012-03-30 16:31:08 -0700 @@ -23,7 +23,7 @@ Signed-off-by: Sean Hefty --- diff --git a/Makefile.am b/Makefile.am -index 503ad72..4ede5ae 100644 +index 503ad72..58e3415 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,12 @@ @@ -43,7 +43,7 @@ index 503ad72..4ede5ae 100644 util_ib_acme_CFLAGS = $(AM_CFLAGS) ibacmincludedir = $(includedir)/infiniband -@@ -15,12 +15,21 @@ ibacminclude_HEADERS = include/infiniband/acm.h +@@ -15,12 +15,24 @@ ibacminclude_HEADERS = include/infiniband/acm.h man_MANS = \ man/ib_acme.1 \ @@ -63,6 +63,9 @@ index 503ad72..4ede5ae 100644 + if ! test -d $(DESTDIR)$(sysconfdir); then \ + mkdir -p $(DESTDIR)$(sysconfdir); \ + fi; \ ++ if ! test -d $(DESTDIR)$(sysconfdir)/rdma; then \ ++ mkdir -p $(DESTDIR)$(sysconfdir)/rdma; \ ++ fi; \ + if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \ + mkdir -p $(DESTDIR)$(sysconfdir)/init.d; \ + fi; \ @@ -297,10 +300,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..c2360f3 100644 +index 33ea842..169e041 100644 --- a/linux/osd.h +++ b/linux/osd.h -@@ -45,9 +45,14 @@ +@@ -45,9 +45,15 @@ #include #include @@ -308,11 +311,12 @@ index 33ea842..c2360f3 100644 -#define ACM_ADDR_FILE "acm_addr.cfg" -#define ACM_OPTS_FILE "acm_opts.cfg" +#ifndef SYSCONFDIR -+#define SYSCONFDIR "/etc/rdma" ++#define SYSCONFDIR "/etc" +#endif +#ifndef BINDIR +#define BINDIR "/usr/bin" +#endif ++#define ACM_CONF_DIR SYSCONFDIR "/rdma" +#define ACM_ADDR_FILE "ibacm_addr.cfg" +#define ACM_OPTS_FILE "ibacm_opts.cfg" @@ -547,7 +551,7 @@ index f26ffb8..c0c63fc 100644 -ib_acme(1), ib_acm(1) +ib_acme(1), ibacm(1) diff --git a/src/acm.c b/src/acm.c -index 906c926..82436e6 100644 +index 906c926..4e90e8c 100644 --- a/src/acm.c +++ b/src/acm.c @@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER]; @@ -557,8 +561,8 @@ index 906c926..82436e6 100644 -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 *opts_file = ACM_CONF_DIR "/" ACM_OPTS_FILE; ++static char *addr_file = ACM_CONF_DIR "/" 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"; @@ -584,15 +588,15 @@ index 906c926..82436e6 100644 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(" (default %s/%s\n", ACM_CONF_DIR, 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); ++ printf(" (default %s/%s\n", ACM_CONF_DIR, ACM_OPTS_FILE); } int CDECL_FUNC main(int argc, char **argv) diff --git a/src/acme.c b/src/acme.c -index 3d7461b..94ff710 100644 +index 3d7461b..5bc6461 100644 --- a/src/acme.c +++ b/src/acme.c @@ -43,7 +43,7 @@ @@ -600,7 +604,7 @@ index 3d7461b..94ff710 100644 #include "libacm.h" -static char *dest_dir = ACM_DEST_DIR; -+static char *dest_dir = SYSCONFDIR; ++static char *dest_dir = ACM_CONF_DIR; static char *addr_file = ACM_ADDR_FILE; static char *opts_file = ACM_OPTS_FILE; @@ -626,7 +630,7 @@ index 3d7461b..94ff710 100644 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(" (default is %s)\n", ACM_CONF_DIR); printf(" -V - enable verbose output\n"); } diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index c2bc260..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,89 +0,0 @@ -Bottom: 56f2c285e9a48bd5f17f10c897f8f459b10cd403 -Top: 5845b20997dda75dd9baf21235ec37582f2e3321 -Author: sean.hefty@intel.com -Date: 2012-04-03 11:38:12 -0700 - -Refresh of daemonize - ---- - -diff --git a/Makefile.am b/Makefile.am -index 4ede5ae..58e3415 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -26,6 +26,9 @@ install-exec-hook: - if ! test -d $(DESTDIR)$(sysconfdir); then \ - mkdir -p $(DESTDIR)$(sysconfdir); \ - fi; \ -+ if ! test -d $(DESTDIR)$(sysconfdir)/rdma; then \ -+ mkdir -p $(DESTDIR)$(sysconfdir)/rdma; \ -+ fi; \ - if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \ - mkdir -p $(DESTDIR)$(sysconfdir)/init.d; \ - fi; \ -diff --git a/linux/osd.h b/linux/osd.h -index c2360f3..169e041 100644 ---- a/linux/osd.h -+++ b/linux/osd.h -@@ -46,11 +46,12 @@ - #include - - #ifndef SYSCONFDIR --#define SYSCONFDIR "/etc/rdma" -+#define SYSCONFDIR "/etc" - #endif - #ifndef BINDIR - #define BINDIR "/usr/bin" - #endif -+#define ACM_CONF_DIR SYSCONFDIR "/rdma" - #define ACM_ADDR_FILE "ibacm_addr.cfg" - #define ACM_OPTS_FILE "ibacm_opts.cfg" - -diff --git a/src/acm.c b/src/acm.c -index 82436e6..4e90e8c 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -206,8 +206,8 @@ 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 *opts_file = ACM_CONF_DIR "/" ACM_OPTS_FILE; -+static char *addr_file = ACM_CONF_DIR "/" 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"; -@@ -3157,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"); -- printf(" (default %s/%s\n", SYSCONFDIR, ACM_ADDR_FILE); -+ printf(" (default %s/%s\n", ACM_CONF_DIR, ACM_ADDR_FILE); - printf(" [-O option_file] - option configuration file\n"); -- printf(" (default %s/%s\n", SYSCONFDIR, ACM_OPTS_FILE); -+ printf(" (default %s/%s\n", ACM_CONF_DIR, ACM_OPTS_FILE); - } - - int CDECL_FUNC main(int argc, char **argv) -diff --git a/src/acme.c b/src/acme.c -index 94ff710..5bc6461 100644 ---- a/src/acme.c -+++ b/src/acme.c -@@ -43,7 +43,7 @@ - #include - #include "libacm.h" - --static char *dest_dir = SYSCONFDIR; -+static char *dest_dir = ACM_CONF_DIR; - 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", SYSCONFDIR); -+ printf(" (default is %s)\n", ACM_CONF_DIR); - printf(" -V - enable verbose output\n"); - } -- 2.46.0