refresh

diff --git a/meta b/meta
index dcff56bdb82050e1b45c4dd743d9182935c77968..963de991f6175233063ad844db2170c457fa5cff 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 58915f0b1f2f800f1daa9c4813542a00cc147180
-Head: a669bf1d68666121397647efbb8349e3066dfc07
+Previous: 0a34438a34b79e1bed475a77308c2dd53baa1bc3
+Head: 693b33183e2e4352157933034ae18f340dd4ccac
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 86de820832e1cb07f1c2203a721e062c0f3f6f7d
-  refresh-temp: a669bf1d68666121397647efbb8349e3066dfc07
+  daemonize: 693b33183e2e4352157933034ae18f340dd4ccac
 Unapplied:
   rel-1.0.6: fd63522aa6aad86267c45e2949a958056edfe41a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index db14a43de748d6eae5db87960b6e06c093d5e0ea..a9986f127809ce7217b707c97802ddfaaf0de864 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    419800c462f59b8abbdf1da6076abe747eec472c
+Top:    8285b68cb4f3673b766a8f3737ad90d34cbf9272
 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..87b71ab 100644
+index 503ad72..dea90f2 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -3,10 +3,10 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
@@ -60,7 +60,7 @@ index 503ad72..87b71ab 100644
 +      if ! test -d $(DESTDIR)$(sysconfdir); then \
 +              mkdir -p $(DESTDIR)$(sysconfdir); \
 +      fi; \
-+      install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/ibacmd;
++      install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd;
  
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a053449..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 419800c462f59b8abbdf1da6076abe747eec472c
-Top:    8285b68cb4f3673b766a8f3737ad90d34cbf9272
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 17:12:24 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 87b71ab..dea90f2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,7 +26,7 @@ install-exec-hook:
-       if ! test -d $(DESTDIR)$(sysconfdir); then \
-               mkdir -p $(DESTDIR)$(sysconfdir); \
-       fi; \
--      install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/ibacmd;
-+      install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd;
- 
- dist-hook: ibacm.spec
-       cp ibacm.spec $(distdir)