refresh

diff --git a/meta b/meta
index ea07a9aa685ee39660dffc4d25cf35eb52a3cd1b..29cdbcfa903ba0f48e8c5a8e94a52357091de05a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 688ebe2ddcd4ac22da7a3a43042da72fe372251a
-Head: 90d8d040e8e18f4e7679b9fc61ccba11d5ffd808
+Previous: 56f9eedfd0f6cfd61f7f55e1853b5499bfe0c103
+Head: a7cbf193e1380f030e1dc3ac254d5f8b809addbf
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 276e46566694ed5a2456e32408eb22d896586b56
-  refresh-temp: 90d8d040e8e18f4e7679b9fc61ccba11d5ffd808
+  daemonize: a7cbf193e1380f030e1dc3ac254d5f8b809addbf
 Unapplied:
   rel-1.0.6: ad4775ae67191f717749953f0f7d00f806c75a05
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 6033036f54652db08a879ae13bb4be52be0ab4eb..322bbe87c562028574d8b6e7879dc9b324a96256 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    b8fdd0200efe22a2cc85ef2b2f7837d307532809
+Top:    bcfe55a7b8465a2de8f31db6b58294a141a92341
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -23,7 +23,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 503ad72..966de5e 100644
+index 503ad72..96a4514 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,12 +1,12 @@
@@ -43,7 +43,7 @@ index 503ad72..966de5e 100644
  util_ib_acme_CFLAGS = $(AM_CFLAGS)
  
  ibacmincludedir = $(includedir)/infiniband
-@@ -15,12 +15,18 @@ ibacminclude_HEADERS = include/infiniband/acm.h
+@@ -15,12 +15,21 @@ ibacminclude_HEADERS = include/infiniband/acm.h
  
  man_MANS = \
        man/ib_acme.1 \
@@ -63,13 +63,16 @@ index 503ad72..966de5e 100644
 +      if ! test -d $(DESTDIR)$(sysconfdir); then \
 +              mkdir -p $(DESTDIR)$(sysconfdir); \
 +      fi; \
++      if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \
++              mkdir -p $(DESTDIR)$(sysconfdir); \
++      fi; \
 +      install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd;
  
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
 diff --git a/ibacm.init b/ibacm.init
 new file mode 100644
-index 0000000..8f863eb
+index 0000000..4000cb6
 --- /dev/null
 +++ b/ibacm.init
 @@ -0,0 +1,100 @@
@@ -96,7 +99,7 @@ index 0000000..8f863eb
 +
 +pidfile=/var/run/ibacm.pid
 +subsys=/var/lock/subsys/ibacm
-+prog=/usr/sbin/ibacm
++prog=$(sbindir)/ibacm
 +
 +. /etc/rc.d/init.d/functions
 +

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 426c3bb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: b8fdd0200efe22a2cc85ef2b2f7837d307532809
-Top:    bcfe55a7b8465a2de8f31db6b58294a141a92341
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-04-02 16:37:52 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 966de5e..96a4514 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,6 +26,9 @@ install-exec-hook:
-       if ! test -d $(DESTDIR)$(sysconfdir); then \
-               mkdir -p $(DESTDIR)$(sysconfdir); \
-       fi; \
-+      if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \
-+              mkdir -p $(DESTDIR)$(sysconfdir); \
-+      fi; \
-       install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd;
- 
- dist-hook: ibacm.spec
-diff --git a/ibacm.init b/ibacm.init
-index 8f863eb..4000cb6 100644
---- a/ibacm.init
-+++ b/ibacm.init
-@@ -21,7 +21,7 @@
- 
- pidfile=/var/run/ibacm.pid
- subsys=/var/lock/subsys/ibacm
--prog=/usr/sbin/ibacm
-+prog=$(sbindir)/ibacm
- 
- . /etc/rc.d/init.d/functions