refresh

diff --git a/meta b/meta
index e083d0d1ddec62afac40f9073b66b456d79dc364..2b345a0ae9e32e2afc2685fc7cb25e67d8d05d9f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: d468add6243da0b45945cb5213e04aa43bc00e06
-Head: eec4c33df753d2953b6227fa985324497b3d19c0
+Previous: aacbeaff92ad4ae7106389c922ddc223d42b3008
+Head: f5cc9c1794700bda0a62967250a00ea9bae5839e
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -14,8 +14,7 @@ Applied:
   no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
   nodelay: 3dc208def66463660ee185a0346722561e7c2448
-  acme_dest: 9aa17cd45975ceab8c284a6df7d5ec8a36f25482
-  refresh-temp: eec4c33df753d2953b6227fa985324497b3d19c0
+  acme_dest: f5cc9c1794700bda0a62967250a00ea9bae5839e
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/acme_dest b/patches/acme_dest
index a7decbed7b8e44e46b29475ac71cb6ad72896fc3..886ad598ad8d42bbee2b0137fd07844a36f1a70e 100644 (file)
--- a/patches/acme_dest
+++ b/patches/acme_dest
@@ -1,5 +1,5 @@
 Bottom: 6b1a8889e0c9bde043dfd2126fed3c613bff07a0
-Top:    db55135124415ad66423c45af0f7a5cb52391e7e
+Top:    f141944c9884ee22acc7dfcfeed6b44674772b46
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 16:13:22 -0800
 
@@ -96,7 +96,7 @@ index 3ee2073..a75ef34 100644
  
        if (!ret && make_addr)
 diff --git a/src/libacm.c b/src/libacm.c
-index 59a181b..965f7dd 100644
+index 59a181b..d32e749 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -113,6 +113,7 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
@@ -125,7 +125,7 @@ index 59a181b..965f7dd 100644
 +                      case ACM_EP_INFO_NAME:
 +                              memcpy(addr, msg->data[i].info.name, ACM_MAX_ADDRESS);
 +                              break;
-+                      default
++                      default:
 +                              goto err;
 +                      }
 +                      printf("source: %s\n", addr);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a8104e8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: db55135124415ad66423c45af0f7a5cb52391e7e
-Top:    f141944c9884ee22acc7dfcfeed6b44674772b46
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 07:55:50 -0800
-
-Refresh of acme_dest
-
----
-
-diff --git a/src/libacm.c b/src/libacm.c
-index 965f7dd..d32e749 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -145,7 +145,7 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
-                       case ACM_EP_INFO_NAME:
-                               memcpy(addr, msg->data[i].info.name, ACM_MAX_ADDRESS);
-                               break;
--                      default
-+                      default:
-                               goto err;
-                       }
-                       printf("source: %s\n", addr);