refresh

diff --git a/meta b/meta
index 57e77ccc5bc354c5ce2e2cb723bf4a1d8d53c580..c223a6176008050f07120e4fb90914df329bb7c7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 55ce82cd605befc300768702382f78f949ba9112
-Head: e0214bb857b1b10fe687da0622127750a8ca3ecc
+Previous: 58eab7ae02c38cf777c26d826360ada9d0e4522d
+Head: 53dc6adf920cffe564f0a355a2f646e10f5177a8
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 95e1f4acd08da734478ce456965d7d56f375fd99
-  refresh-temp: e0214bb857b1b10fe687da0622127750a8ca3ecc
+  daemonize: 53dc6adf920cffe564f0a355a2f646e10f5177a8
 Unapplied:
   rel-1.0.6: 281f27976322720889f56dea769af7fc7e056bfe
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 1503db2fc90025bd4269326e9a21593206515aaa..23eb9134c48ecf7a38056b89a41c53350e3c99e4 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    f73d93c29562cc77be5e9a08e0da8c7839cde77b
+Top:    7bfdae31b39347ec07992c06790a1c8943d12add
 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..10b0c36 100644
+index 736f657..05050dd 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 418c80a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: f73d93c29562cc77be5e9a08e0da8c7839cde77b
-Top:    7bfdae31b39347ec07992c06790a1c8943d12add
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-02 14:35:53 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/configure.in b/configure.in
-index 10b0c36..05050dd 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