refresh

diff --git a/meta b/meta
index 4871fcbfb211c6985eb41117e05084a868fb7e8a..32763c901b21055e255565b863638a4e79dda53a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 09885bda97b2b7976ffd582281000e1c5b69d81d
-Head: 681861a59b9ebb503d5a5e7d045d318025b9286b
+Previous: fc15eb9aad76a3785551884c58104b2a641b1a30
+Head: 4c2c0c0ee997fbb00b928cfd471606c2d6209613
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: fd0081e6f0b58e667a55375cf8baf158ed289f3b
-  refresh-temp: 681861a59b9ebb503d5a5e7d045d318025b9286b
+  daemonize: 4c2c0c0ee997fbb00b928cfd471606c2d6209613
 Unapplied:
   rel-1.0.6: a8472c3e53361c5455418b0c212b02a56a0a91a3
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 0e5264e36577f40b28ddfb897853e653264c6429..2d01510ffc87e4deeea4833e76f9be057413b7ee 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    9ffb8a216b16c5f36346ed4e2eb20700dd457bd9
+Top:    56f2c285e9a48bd5f17f10c897f8f459b10cd403
 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..d3d08b2 100644
+index 503ad72..4ede5ae 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,12 +1,12 @@
@@ -64,7 +64,7 @@ index 503ad72..d3d08b2 100644
 +              mkdir -p $(DESTDIR)$(sysconfdir); \
 +      fi; \
 +      if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \
-+              mkdir -p $(DESTDIR)$(sysconfdir); \
++              mkdir -p $(DESTDIR)$(sysconfdir)/init.d; \
 +      fi; \
 +      install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 707e543..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 9ffb8a216b16c5f36346ed4e2eb20700dd457bd9
-Top:    56f2c285e9a48bd5f17f10c897f8f459b10cd403
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-04-02 17:31:53 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index d3d08b2..4ede5ae 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,7 +27,7 @@ install-exec-hook:
-               mkdir -p $(DESTDIR)$(sysconfdir); \
-       fi; \
-       if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \
--              mkdir -p $(DESTDIR)$(sysconfdir); \
-+              mkdir -p $(DESTDIR)$(sysconfdir)/init.d; \
-       fi; \
-       install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd;