refresh

diff --git a/meta b/meta
index 1cbcdc63bfea55f298c6909badddab7dcaea45dd..d78543eea67a6b513d144f90da82f0c76aa43ddb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 462aacfa413b38dd180504906d4c175e00b45be6
-Head: 124bc8f04bb50bb3307dda02ecaab0e89dd87703
+Previous: 08190913c045cdcbfce86e22e0db6130abfc1fac
+Head: 671da1790a0bc0557d41eea2ecae65e7864c2f4f
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
-  refresh-temp: 124bc8f04bb50bb3307dda02ecaab0e89dd87703
+  rename-ibacm: 671da1790a0bc0557d41eea2ecae65e7864c2f4f
 Unapplied:
   file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
   init-script: 9c635a29c0fff899915c5ac3775d8cfc748c2573

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e972afc..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,62 +0,0 @@
-Bottom: b7ef43780109283b77986862aa8504222eb78bce
-Top:    020de55b0b3d1ad214fe74cfc5ad3e404261d5c3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 15:59:07 -0700
-
-Refresh of rename-ibacm
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 3d7461b..43e6dd9 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -69,7 +69,7 @@ extern char **parse(char *args, int *count);
- static void show_usage(char *program)
- {
-       printf("usage 1: %s\n", program);
--      printf("Query specified ib_acm service for data\n");
-+      printf("Query specified ibacm service for data\n");
-       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)
-       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);
--      printf("Generate default ib_acm service configuration and option files\n");
-+      printf("Generate default ibacm service configuration and option files\n");
-       printf("   -A [addr_file]   - generate local address configuration file\n");
-       printf("                      (default is %s)\n", ACM_ADDR_FILE);
--      printf("   -O [opt_file]    - generate local acm_opts.cfg options file\n");
-+      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);
-@@ -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");
-       fprintf(f, "# Use ib_acme utility with -O option to automatically generate a sample\n");
--      fprintf(f, "# acm_opts.cfg file for the current system.\n");
-+      fprintf(f, "# ibacm_opts.cfg file for the current system.\n");
-       fprintf(f, "#\n");
-       fprintf(f, "# Entry format is:\n");
-       fprintf(f, "# name value\n");
-@@ -123,7 +123,7 @@ static void gen_opts_temp(FILE *f)
-       fprintf(f, "# Specifies the location of the ACM lock file used to ensure that only a\n");
-       fprintf(f, "# single instance of ACM is running.\n");
-       fprintf(f, "\n");
--      fprintf(f, "lock_file /var/lock/ibacm.pid\n");
-+      fprintf(f, "lock_file /var/run/ibacm.pid\n");
-       fprintf(f, "\n");
-       fprintf(f, "# addr_prot:\n");
-       fprintf(f, "# Default resolution protocol to resolve IP addresses into IB GIDs.\n");
-@@ -253,7 +253,7 @@ static void gen_addr_temp(FILE *f)
-       fprintf(f, "# InfiniBand Communication Management Assistant for clusters address file\n");
-       fprintf(f, "#\n");
-       fprintf(f, "# Use ib_acme utility with -G option to automatically generate a sample\n");
--      fprintf(f, "# acm_addr.cfg file for the current system.\n");
-+      fprintf(f, "# ibacm_addr.cfg file for the current system.\n");
-       fprintf(f, "#\n");
-       fprintf(f, "# Entry format is:\n");
-       fprintf(f, "# address device port pkey\n");

diff --git a/patches/rename-ibacm b/patches/rename-ibacm
index 256d7dfc120469ebd572a0daca0d346ff2f1be06..1c2bdb19c93d55b523f8271d6a31fb344a5cf63f 100644 (file)
--- a/patches/rename-ibacm
+++ b/patches/rename-ibacm
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    b7ef43780109283b77986862aa8504222eb78bce
+Top:    020de55b0b3d1ad214fe74cfc5ad3e404261d5c3
 Author: Doug Ledford <dledford@redhat.com>
 Date:   2012-03-01 16:40:08 -0800
 
@@ -375,4 +375,57 @@ index f26ffb8..22c28a3 100644
  .SH "SEE ALSO"\r
  ib_acm_resolve_name(3), ib_acm_resolve_ip(3), ib_acm_resolve_path(3)\r
 -ib_acme(1), ib_acm(1)\r
-+ib_acme(1), ibacm(1)
++ib_acme(1), ibacm(1)\r
+diff --git a/src/acme.c b/src/acme.c
+index 3d7461b..43e6dd9 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -69,7 +69,7 @@ extern char **parse(char *args, int *count);
+ static void show_usage(char *program)
+ {
+       printf("usage 1: %s\n", program);
+-      printf("Query specified ib_acm service for data\n");
++      printf("Query specified ibacm service for data\n");
+       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)
+       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);
+-      printf("Generate default ib_acm service configuration and option files\n");
++      printf("Generate default ibacm service configuration and option files\n");
+       printf("   -A [addr_file]   - generate local address configuration file\n");
+       printf("                      (default is %s)\n", ACM_ADDR_FILE);
+-      printf("   -O [opt_file]    - generate local acm_opts.cfg options file\n");
++      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);
+@@ -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");
+       fprintf(f, "# Use ib_acme utility with -O option to automatically generate a sample\n");
+-      fprintf(f, "# acm_opts.cfg file for the current system.\n");
++      fprintf(f, "# ibacm_opts.cfg file for the current system.\n");
+       fprintf(f, "#\n");
+       fprintf(f, "# Entry format is:\n");
+       fprintf(f, "# name value\n");
+@@ -123,7 +123,7 @@ static void gen_opts_temp(FILE *f)
+       fprintf(f, "# Specifies the location of the ACM lock file used to ensure that only a\n");
+       fprintf(f, "# single instance of ACM is running.\n");
+       fprintf(f, "\n");
+-      fprintf(f, "lock_file /var/lock/ibacm.pid\n");
++      fprintf(f, "lock_file /var/run/ibacm.pid\n");
+       fprintf(f, "\n");
+       fprintf(f, "# addr_prot:\n");
+       fprintf(f, "# Default resolution protocol to resolve IP addresses into IB GIDs.\n");
+@@ -253,7 +253,7 @@ static void gen_addr_temp(FILE *f)
+       fprintf(f, "# InfiniBand Communication Management Assistant for clusters address file\n");
+       fprintf(f, "#\n");
+       fprintf(f, "# Use ib_acme utility with -G option to automatically generate a sample\n");
+-      fprintf(f, "# acm_addr.cfg file for the current system.\n");
++      fprintf(f, "# ibacm_addr.cfg file for the current system.\n");
+       fprintf(f, "#\n");
+       fprintf(f, "# Entry format is:\n");
+       fprintf(f, "# address device port pkey\n");