refresh

diff --git a/meta b/meta
index 96610e79dc98b3e896314d037e5fc57434503622..e73c3d8d34f6c67ae3a3c2bb2c11ac2d9ab04ffb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 07b7091e7e4d7914eed3dc92d2db009f8d6ecb8f
-Head: 11e48f5cd0030760ddce9cf81b42b07088c0ee6a
+Previous: d451dd9570b74483e488aa6bfa2cc3baf295bf9b
+Head: edc6fadc150ebff8f907cecbcaac6e9ff37abc9f
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,7 @@ Applied:
   locking: 558e5577364aec3531c54b28def6e16f0c926524
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
-  no_addr: 05c3c71ca5b9a5f194b2abb0c4b526a0b848b86f
-  refresh-temp: 11e48f5cd0030760ddce9cf81b42b07088c0ee6a
+  no_addr: edc6fadc150ebff8f907cecbcaac6e9ff37abc9f
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/no_addr b/patches/no_addr
index 5b0e95bc45720cf9510e097632804ab45997cf13..4e182e2675a5dbdb0f7421a4d5d6965d2cf6aae2 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -1,5 +1,5 @@
 Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4
-Top:    3baf1b9aac461c95718fd03a923208c4eb483a13
+Top:    1677bd6e63e9a673f9651e2fec6fbb09dcb646ce
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:06:47 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 9ff81c4..b095a07 100644
+index 9ff81c4..c7e2768 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,6 +203,7 @@ static SOCKET listen_socket;
@@ -71,7 +71,7 @@ index 9ff81c4..b095a07 100644
 +              return f;
 +
 +      acm_log(0, "notice - generating acm_addr.cfg file\n");
-+      if (!(f = popen("ib_acm -A", "r"))) {
++      if (!(f = popen("ib_acme -A", "r"))) {
 +              acm_log(0, "ERROR - cannot generate acm_addr.cfg\n");
 +              return NULL;
 +      }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8368190..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 3baf1b9aac461c95718fd03a923208c4eb483a13
-Top:    1677bd6e63e9a673f9651e2fec6fbb09dcb646ce
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 11:34:30 -0800
-
-Refresh of no_addr
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index b095a07..c7e2768 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2725,7 +2725,7 @@ static FILE *acm_open_addr_file(void)
-               return f;
- 
-       acm_log(0, "notice - generating acm_addr.cfg file\n");
--      if (!(f = popen("ib_acm -A", "r"))) {
-+      if (!(f = popen("ib_acme -A", "r"))) {
-               acm_log(0, "ERROR - cannot generate acm_addr.cfg\n");
-               return NULL;
-       }