refresh

diff --git a/meta b/meta
index a4c7fe39cf298487134c0c1f8cfcdac5d609277c..75172dd4ef4ad2dccad7d896651c750775d49d9f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 9ca38e709d6dffdcb3823eeb80ee04c5f9b9a462
-Head: 17adc99ea73813635abd0f8f4e6a81fbcde3f937
+Previous: 8465314c5d0828329bb67479f08a89b4cf4864bf
+Head: e1c8476c90624f2345ef3f19aae90a21363ba507
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   daemon: 7b29fa2e46e60f2cec734b59f7efe8cdeec59660
-  cfg: c05101361b7b764cdddeb74abf2a3794076d0fea
-  refresh-temp: 17adc99ea73813635abd0f8f4e6a81fbcde3f937
+  cfg: e1c8476c90624f2345ef3f19aae90a21363ba507
 Unapplied:
 Hidden:

diff --git a/patches/cfg b/patches/cfg
index 954df2761255294a56aaedf2dc41ffc59e09476e..6582f379049ff9afea54a290af7279a29aa46338 100644 (file)
--- a/patches/cfg
+++ b/patches/cfg
@@ -1,5 +1,5 @@
 Bottom: d4ad38b0621522078c4a0701602ea4b83a80e903
-Top:    3daa31d8f3455847d0120c57262abe465bd61e37
+Top:    9b9f7bf0bb8726c6cf07b631ea424b7797046fc0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:12:24 -0700
 
@@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 2b1e1fd..53499f9 100755
+index 2b1e1fd..d64719a 100755
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -191,6 +191,8 @@ static struct acm_client client[FD_SETSIZE - 1];
@@ -28,6 +28,24 @@ index 2b1e1fd..53499f9 100755
  static char log_file[128] = "stdout";
  static int log_level = 0;
  static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
+@@ -2198,7 +2200,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+       acm_log(1, "device %s, port %d, pkey 0x%x\n",
+               dev_name, ep->port->port_num, ep->pkey);
+ 
+-      if (!(f = fopen("acm_addr.cfg", "r"))) {
++      if (!(f = fopen(addr_file, "r"))) {
+               acm_log(0, "ERROR - unable to open acm_addr.cfg file\n");
+               return ACM_STATUS_ENODATA;
+       }
+@@ -2537,7 +2539,7 @@ static void acm_set_options(void)
+       char s[120];
+       char opt[32], value[32];
+ 
+-      if (!(f = fopen("acm_opts.cfg", "r")))
++      if (!(f = fopen(opts_file, "r")))
+               return;
+ 
+       while (fgets(s, sizeof s, f)) {
 @@ -2638,7 +2640,11 @@ static void daemonize(void)
  static void show_usage(char *program)
  {

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3ba9453..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 3daa31d8f3455847d0120c57262abe465bd61e37
-Top:    9b9f7bf0bb8726c6cf07b631ea424b7797046fc0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-23 18:02:53 -0700
-
-Refresh of cfg
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 53499f9..d64719a 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2200,7 +2200,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
-       acm_log(1, "device %s, port %d, pkey 0x%x\n",
-               dev_name, ep->port->port_num, ep->pkey);
- 
--      if (!(f = fopen("acm_addr.cfg", "r"))) {
-+      if (!(f = fopen(addr_file, "r"))) {
-               acm_log(0, "ERROR - unable to open acm_addr.cfg file\n");
-               return ACM_STATUS_ENODATA;
-       }
-@@ -2539,7 +2539,7 @@ static void acm_set_options(void)
-       char s[120];
-       char opt[32], value[32];
- 
--      if (!(f = fopen("acm_opts.cfg", "r")))
-+      if (!(f = fopen(opts_file, "r")))
-               return;
- 
-       while (fgets(s, sizeof s, f)) {