refresh

diff --git a/meta b/meta
index 2753461e954707e7e80273bf2fd857f5a8174414..09785b107eadd951a6328492781075c8309a6a77 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: d5d30b2be7b72ad65debb3fbc8c25dd1eef527fb
-Head: aa4116d4d6ebfde066d2f8e67a9e6d2f590d2093
+Previous: f539f2aa7a0d61c5df0b897f75dfdac82d1f52dc
+Head: 17a03423af8c01271a8cf628220f4818e981ef58
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 53dc6adf920cffe564f0a355a2f646e10f5177a8
-  refresh-temp: aa4116d4d6ebfde066d2f8e67a9e6d2f590d2093
+  daemonize: 17a03423af8c01271a8cf628220f4818e981ef58
 Unapplied:
   rel-1.0.6: 9b6af04843c61b31fbf99fad3abf5bd4ed4d14e6
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 23eb9134c48ecf7a38056b89a41c53350e3c99e4..108edd23b09f3f84b84ce614df31d477731a8c9c 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    7bfdae31b39347ec07992c06790a1c8943d12add
+Top:    4c82b167feabab9888add81394d414860eee6f6a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -65,14 +65,14 @@ index 503ad72..dea90f2 100644
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
 diff --git a/configure.in b/configure.in
-index 736f657..05050dd 100644
+index 736f657..f6aa3ff 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -58,6 +58,7 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
      fi)\r
  \r
  AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")\r
-+AC_DEFINE(ACM_DEST_DIR, "\"$sysconfdir\"", [setting configuration directory])\r
++AC_DEFINE(ACM_DEST_DIR, "$sysconfdir", [setting configuration directory])\r
  \r
  AC_CONFIG_FILES([Makefile ibacm.spec])\r
  AC_OUTPUT\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9f4da92..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 7bfdae31b39347ec07992c06790a1c8943d12add
-Top:    4c82b167feabab9888add81394d414860eee6f6a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-02 14:42:24 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/configure.in b/configure.in
-index 05050dd..f6aa3ff 100644
---- a/configure.in
-+++ b/configure.in
-@@ -58,7 +58,7 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
-     fi)\r
- \r
- AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")\r
--AC_DEFINE(ACM_DEST_DIR, "\"$sysconfdir\"", [setting configuration directory])\r
-+AC_DEFINE(ACM_DEST_DIR, "$sysconfdir", [setting configuration directory])\r
- \r
- AC_CONFIG_FILES([Makefile ibacm.spec])\r
- AC_OUTPUT