refresh

diff --git a/meta b/meta
index 26bba9574e245aaa162c2442aac6d6cf5341dd7f..7246b781b2e19d43b3efe2c0b1f1fa8e9e551f7e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 8b8c5781be6d6bf4bfba2b86eb9c9b0e27dab09d
-Head: b0bc05724538ccf434a47763cce389a10c4554cb
+Previous: f68777c53311269af0c67e89c9cf1628a29cd94f
+Head: efe6b43a25d463ba584443432ce1710738322f68
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
-  daemonize: 064b4c4108b558a00546347a486e885224e08afa
-  refresh-temp: b0bc05724538ccf434a47763cce389a10c4554cb
+  daemonize: efe6b43a25d463ba584443432ce1710738322f68
 Unapplied:
   rel-1.0.6: e85828b35526c579e4fd98e8eeb81d1372a230ef
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 16bf664d40acd4d8d1bf42ab2c40c4351a9bb35c..a0c184d53bcd77048799da10484e9e0e01f44b36 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    13678e756ab293cc74529959deebb478e4e49959
+Top:    24375da4f05b00107f7e0d86cc2f092dd6d713f6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -79,7 +79,7 @@ index 503ad72..de035bc 100644
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
 diff --git a/configure.in b/configure.in
-index 736f657..a5fd174 100644
+index 736f657..95a09b7 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -59,5 +59,10 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
@@ -88,7 +88,7 @@ index 736f657..a5fd174 100644
  \r
 -AC_CONFIG_FILES([Makefile ibacm.spec])\r
 +AC_ARG_VAR(rdmadir, [Directory for configuration files])\r
-+if test "x$rdmadir" != "x"; then\r
++if test "x$rdmadir" = "x"; then\r
 +   AC_SUBST(rdmadir, rdma)\r
 +fi\r
 +\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index defce44..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 13678e756ab293cc74529959deebb478e4e49959
-Top:    24375da4f05b00107f7e0d86cc2f092dd6d713f6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 19:54:58 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/configure.in b/configure.in
-index a5fd174..95a09b7 100644
---- a/configure.in
-+++ b/configure.in
-@@ -60,7 +60,7 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
- AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")\r
- \r
- AC_ARG_VAR(rdmadir, [Directory for configuration files])\r
--if test "x$rdmadir" != "x"; then\r
-+if test "x$rdmadir" = "x"; then\r
-    AC_SUBST(rdmadir, rdma)\r
- fi