refresh (create temporary patch)

diff --git a/meta b/meta
index c7a0965940f4d5bd1c86f64d00e43373d2236144..42bae2b88a60b81c2b9ebfdeca819fdee65ac31f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: 892cf361f7b772e9e44e6a5d38bd6572af27b5f7
-Head: e1350d3280457341dd720e82890fe911895cd738
+Previous: 21faf4d9ada3d4c16daeaac6d30694bf05d3f9d0
+Head: 6708b270a3b3f26124984bfc6a09c5df5141a8f0
 Applied:
   deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
   counters: ff3d79a44beb17d1ba7e3eb724de877ae0eeebb5
   bld: e1350d3280457341dd720e82890fe911895cd738
+  refresh-temp: 6708b270a3b3f26124984bfc6a09c5df5141a8f0
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..5f0e27f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,34 @@
+Bottom: cd42f24f71f72296a1e200caad51f1dc74bc3f0b
+Top:    4d626bd014913aeb6c868bd83ce47c342b7512a2
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-29 17:38:40 -0700
+
+Refresh of bld
+
+---
+
+diff --git a/src/libacm.c b/src/libacm.c
+index b57710a..11b88da 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -127,17 +127,17 @@ static int acm_format_resp(struct acm_msg *msg,
+               return -1;
+ 
+       for (i = 0; i < addr_cnt; i++) {
+-              switch (msg->data[i].type) {
++              switch (msg->resolve_data[i].type) {
+               case ACM_EP_INFO_PATH:
+                       path_data[i].flags = msg->resolve_data[i].flags;
+                       path_data[i].path  = msg->resolve_data[i].info.path;
+                       (*count)++;
+                       break;
+               default:
+-                      if (!(msg->data[i].flags & ACM_EP_FLAG_SOURCE))
++                      if (!(msg->resolve_data[i].flags & ACM_EP_FLAG_SOURCE))
+                               goto err;
+ 
+-                      switch (msg->data[i].type) {
++                      switch (msg->resolve_data[i].type) {
+                       case ACM_EP_INFO_ADDRESS_IP:
+                               inet_ntop(AF_INET, msg->resolve_data[i].info.addr,
+                                       addr, sizeof addr);