refresh

diff --git a/meta b/meta
index 6f6b3db903429f9fc612297244ed535ec89555d2..9adfde16dfb387030f6ee4357cdfcd500cc8395f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b0a2b5bd70c6f3437271886d2051b78006c82e3c
-Head: 15f8765b1716aaa4610033c43a7ba6e321d4b580
+Previous: 4a983aaa170625dc4c9c8d6733046eaf34564a17
+Head: f07941f8e61b976c2d9cc7af9f62911cf17435c0
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -16,8 +16,7 @@ Applied:
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
   acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
-  mult_dest: 5ae12adc5bb0664936f36a30753be74378ab7040
-  refresh-temp: 15f8765b1716aaa4610033c43a7ba6e321d4b580
+  mult_dest: f07941f8e61b976c2d9cc7af9f62911cf17435c0
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:

diff --git a/patches/mult_dest b/patches/mult_dest
index e3f85ef68d19ccba0d1735f45407386f42f2f1bc..3ad0637dfde1f4b41442c58d99a38cf77bf4b008 100644 (file)
--- a/patches/mult_dest
+++ b/patches/mult_dest
@@ -1,5 +1,5 @@
 Bottom: 32a7b8b2ffc23b410dc19c50a9bf68e149662635
-Top:    632943322bbfcb0df14ab3a85bb99d324acd8545
+Top:    d6f69c04b4e914797d9eb22ea7b1a9dc8b4b1dd2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 09:39:52 -0800
 
@@ -50,7 +50,7 @@ index 56c49f0..de212fb 100644
  \-v\r
  Indicates that the resolved path information should be verified with the\r
 diff --git a/src/acme.c b/src/acme.c
-index 7e1ca5e..cbb5345 100644
+index 7e1ca5e..6aa256a 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -60,6 +60,7 @@ struct ibv_context **verbs;
@@ -75,7 +75,7 @@ index 7e1ca5e..cbb5345 100644
  
        ret = libacm_init();
        if (ret) {
-@@ -523,28 +525,38 @@ static int resolve(char *program)
+@@ -523,28 +525,39 @@ static int resolve(char *program)
                return ret;
        }
  
@@ -126,13 +126,14 @@ index 7e1ca5e..cbb5345 100644
 +
 +              if (verify)
 +                      ret = verify_resolve(&path);
++              printf("\n");
 +      }
  
 +      free(dest_list);
        libacm_cleanup();
        return ret;
  }
-@@ -562,6 +574,7 @@ char *opt_arg(int argc, char **argv)
+@@ -562,6 +575,7 @@ char *opt_arg(int argc, char **argv)
  
  int CDECL_FUNC main(int argc, char **argv)
  {
@@ -140,7 +141,7 @@ index 7e1ca5e..cbb5345 100644
        int op, ret;
  
        ret = osd_init();
-@@ -577,7 +590,7 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -577,7 +591,7 @@ int CDECL_FUNC main(int argc, char **argv)
                        src_addr = optarg;
                        break;
                case 'd':
@@ -149,7 +150,7 @@ index 7e1ca5e..cbb5345 100644
                        break;
                case 'v':
                        verify = 1;
-@@ -607,14 +620,14 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -607,14 +621,14 @@ int CDECL_FUNC main(int argc, char **argv)
                }
        }
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1d03ec2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 632943322bbfcb0df14ab3a85bb99d324acd8545
-Top:    d6f69c04b4e914797d9eb22ea7b1a9dc8b4b1dd2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 11:11:00 -0800
-
-Refresh of mult_dest
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index cbb5345..6aa256a 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -554,6 +554,7 @@ static int resolve(char *program, char *dest_arg)
- 
-               if (verify)
-                       ret = verify_resolve(&path);
-+              printf("\n");
-       }
- 
-       free(dest_list);