From 1527a7150feda745e39122323a65ed1dd2e01568 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 5 Apr 2012 19:41:09 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/daemonize    | 11 ++++++++---
 patches/refresh-temp | 24 ------------------------
 3 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index cf11601..9800b41 100644
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: d98b0da011d2b09a82c8199cd169bb8931623acf
-Head: d0c9db8314795855d5606ca728dfe67c8eb540e7
+Previous: abf2230a4204dd5449d2ec20e10d8533c96afdf2
+Head: 1c0e0082347981cf64a56499270ceebb882a2e49
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
-  daemonize: 3284b7265adb59fe336d804037e9f4ad21ec6a34
-  refresh-temp: d0c9db8314795855d5606ca728dfe67c8eb540e7
+  daemonize: 1c0e0082347981cf64a56499270ceebb882a2e49
 Unapplied:
   rel-1.0.6: d7fd43ec9a7673423198efdce328a917a7e1eeaa
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/daemonize b/patches/daemonize
index 9dc4848..07ed2ff 100644
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    6ea36239e9e1b001476660f0981d732676430a96
+Top:    50077843b8345a1a6c1ef2c6db9ca0e63b9041e4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -79,14 +79,19 @@ index 503ad72..8322614 100644
  dist-hook: ibacm.spec
  	cp ibacm.spec $(distdir)
 diff --git a/configure.in b/configure.in
-index 736f657..0ed6168 100644
+index 736f657..2ba4883 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -59,5 +59,5 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
+@@ -59,5 +59,10 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
  
  AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")
  
 -AC_CONFIG_FILES([Makefile ibacm.spec])
++AC_ARG_VAR(rdmadir, [Directory for configuration files])
++if test "x$rdmadir" != "x"; then
++   AC_ARG(rdmadir, rdma)
++fi
++
 +AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])
  AC_OUTPUT
 diff --git a/ibacm.init.in b/ibacm.init.in
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 7c585b4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 6ea36239e9e1b001476660f0981d732676430a96
-Top:    50077843b8345a1a6c1ef2c6db9ca0e63b9041e4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 19:41:09 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/configure.in b/configure.in
-index 0ed6168..2ba4883 100644
---- a/configure.in
-+++ b/configure.in
-@@ -59,5 +59,10 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
- 
- AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")
- 
-+AC_ARG_VAR(rdmadir, [Directory for configuration files])
-+if test "x$rdmadir" != "x"; then
-+   AC_ARG(rdmadir, rdma)
-+fi
-+
- AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])
- AC_OUTPUT
-- 
2.41.0