From d4ea6541b5273d1a1680babdc51cdcbd38e4ba30 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 6 Apr 2012 07:50:23 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/daemonize    | 10 +++++-----
 patches/refresh-temp | 35 -----------------------------------
 3 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index a35a0fa..75766f5 100644
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 41720af7ea13b795f17113ec2d33430cb33bafaa
-Head: 07588205b5dfe73ce449440d1fcc84221416102d
+Previous: 8145ec84a7067eb6dcc214c7828fa6c10bacba48
+Head: f5e4961dbf32ce49e2ef1fcb973455bc4ae364fc
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
-  daemonize: 5227d0803811cb7833db89f69bee910fc3318b75
-  refresh-temp: 07588205b5dfe73ce449440d1fcc84221416102d
+  daemonize: f5e4961dbf32ce49e2ef1fcb973455bc4ae364fc
 Unapplied:
   rel-1.0.6: 6b1139f032257843033701e76968dba6580b5f3f
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/daemonize b/patches/daemonize
index e84367d..fb03e7f 100644
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    b0e5aec19ef03c40c11fc0d287d8d422e1ddc77d
+Top:    b0584357c8d1db0b3031585af39c032b9fdd34d5
 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..d38ecbb 100644
+index 736f657..ae9ba5b 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -59,5 +59,11 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
@@ -91,13 +91,13 @@ index 736f657..d38ecbb 100644
 +if test "x$rdmadir" = "x"; then
 +   AC_SUBST(rdmadir, rdma)
 +fi
-+AC_SUBST(_sbindir_, $sbindir)
++AC_SUBST(sbindir)
 +
 +AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])
  AC_OUTPUT
 diff --git a/ibacm.init.in b/ibacm.init.in
 new file mode 100644
-index 0000000..20bbfcf
+index 0000000..b4e807f
 --- /dev/null
 +++ b/ibacm.init.in
 @@ -0,0 +1,99 @@
@@ -131,7 +131,7 @@ index 0000000..20bbfcf
 +{
 +    echo -n "Starting ibacm daemon:"
 +
-+    daemon @_sbindir_@/ibacm
++    daemon @prefix@/sbin/ibacm
 +    RC=$?
 +    [ $RC -eq 0 ] && touch $subsys
 +    echo
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 99116a6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: b0e5aec19ef03c40c11fc0d287d8d422e1ddc77d
-Top:    b0584357c8d1db0b3031585af39c032b9fdd34d5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-06 07:50:23 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/configure.in b/configure.in
-index d38ecbb..ae9ba5b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -63,7 +63,7 @@ AC_ARG_VAR(rdmadir, [Directory for configuration files])
- if test "x$rdmadir" = "x"; then
-    AC_SUBST(rdmadir, rdma)
- fi
--AC_SUBST(_sbindir_, $sbindir)
-+AC_SUBST(sbindir)
- 
- AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])
- AC_OUTPUT
-diff --git a/ibacm.init.in b/ibacm.init.in
-index 20bbfcf..b4e807f 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -28,7 +28,7 @@ start()
- {
-     echo -n "Starting ibacm daemon:"
- 
--    daemon @_sbindir_@/ibacm
-+    daemon @prefix@/sbin/ibacm
-     RC=$?
-     [ $RC -eq 0 ] && touch $subsys
-     echo
-- 
2.46.0