refresh

diff --git a/meta b/meta
index 6e1e7261a3be62a460bc55f2e0e1c98ed5e8906d..f868d1f406809254f69ae538fe8e1b5044a30b42 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 04159c47e74fb34a6336b78543714b3a2bf36a54
-Head: e29384a1ac43fc898e4c42dc6dcec1f493720a6a
+Previous: a4b4cc7fea2f0da0ec8e76cc137355afa3b37edf
+Head: 4cee93e125c1e7e30f4e263b6fa79252717aeb08
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
-  daemonize: 1c0e0082347981cf64a56499270ceebb882a2e49
-  refresh-temp: e29384a1ac43fc898e4c42dc6dcec1f493720a6a
+  daemonize: 4cee93e125c1e7e30f4e263b6fa79252717aeb08
 Unapplied:
   rel-1.0.6: 210cb75f62803554bcf4a325a61a4894cfa37c36
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 07ed2ff575825d4030956310e523f0c7631cc8bb..208b7235dd0eb382906d63b23354d60c3f7d936d 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    50077843b8345a1a6c1ef2c6db9ca0e63b9041e4
+Top:    0c64ec6190ab67d0784c791c1fa1dc67961bdd68
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -79,7 +79,7 @@ index 503ad72..8322614 100644
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
 diff --git a/configure.in b/configure.in
-index 736f657..2ba4883 100644
+index 736f657..a5fd174 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -59,5 +59,10 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
@@ -89,7 +89,7 @@ index 736f657..2ba4883 100644
 -AC_CONFIG_FILES([Makefile ibacm.spec])\r
 +AC_ARG_VAR(rdmadir, [Directory for configuration files])\r
 +if test "x$rdmadir" != "x"; then\r
-+   AC_ARG(rdmadir, rdma)\r
++   AC_SUBST(rdmadir, rdma)\r
 +fi\r
 +\r
 +AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 12e0d4b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 50077843b8345a1a6c1ef2c6db9ca0e63b9041e4
-Top:    0c64ec6190ab67d0784c791c1fa1dc67961bdd68
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 19:48:27 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/configure.in b/configure.in
-index 2ba4883..a5fd174 100644
---- a/configure.in
-+++ b/configure.in
-@@ -61,7 +61,7 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")
- \r
- AC_ARG_VAR(rdmadir, [Directory for configuration files])\r
- if test "x$rdmadir" != "x"; then\r
--   AC_ARG(rdmadir, rdma)\r
-+   AC_SUBST(rdmadir, rdma)\r
- fi\r
- \r
- AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])