refresh

diff --git a/meta b/meta
index 5bd31d7f4142e5e03e52fa751cd2f0682aa98fc2..881877e5912e491038041ad00dc074012178915e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 4d5a62ec19d64d87ddf2d615c01ef20d7578ff62
-Head: 3c88c1b736f2208e051aa7fa361c447bb2b3628a
+Previous: bfbe978239543b84bb031c2a237480478c1a529d
+Head: b0b43a2dbbc7d12b7f9ee521add5c55599478c37
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: bedee4ca29356061a94609eef2ccb3e17d685ef6
-  refresh-temp: 3c88c1b736f2208e051aa7fa361c447bb2b3628a
+  daemonize: b0b43a2dbbc7d12b7f9ee521add5c55599478c37
 Unapplied:
   rel-1.0.6: fd63c4b8b84033117793407c193000cdafefa9c6
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index c30ccd8df00cd321fc8450d474f7d395a7a23c22..1b5ba0f668486a368a8f4dc02610b4a3fba9743b 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    f64639c8ee9ade3de867ad095b9aca1b824c125e
+Top:    1604273c53666ed316bdae220ac61c41dc5e8fda
 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..ccd48a1 100644
+index 503ad72..9465752 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -3,10 +3,10 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
@@ -40,7 +40,7 @@ index 503ad72..ccd48a1 100644
  util_ib_acme_CFLAGS = $(AM_CFLAGS)
  
  ibacmincludedir = $(includedir)/infiniband
-@@ -15,12 +15,19 @@ ibacminclude_HEADERS = include/infiniband/acm.h
+@@ -15,12 +15,17 @@ ibacminclude_HEADERS = include/infiniband/acm.h
  
  man_MANS = \
        man/ib_acme.1 \
@@ -60,8 +60,6 @@ index 503ad72..ccd48a1 100644
 +      if ! test -d $(DESTDIR)$(sysconfdir); then \
 +              mkdir -p $(DESTDIR)$(sysconfdir); \
 +      fi; \
-+      install -m 644 ibacm_opts.cfg $(DESTDIR)$(sysconfdir)/ibacm_opts.cfg; \
-+      install -m 644 ibacm_addr.cfg $(DESTDIR)$(sysconfdir)/ibacm_addr.cfg;
  
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1524167..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: f64639c8ee9ade3de867ad095b9aca1b824c125e
-Top:    1604273c53666ed316bdae220ac61c41dc5e8fda
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 16:48:10 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index ccd48a1..9465752 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,8 +26,6 @@ install-exec-hook:
-       if ! test -d $(DESTDIR)$(sysconfdir); then \
-               mkdir -p $(DESTDIR)$(sysconfdir); \
-       fi; \
--      install -m 644 ibacm_opts.cfg $(DESTDIR)$(sysconfdir)/ibacm_opts.cfg; \
--      install -m 644 ibacm_addr.cfg $(DESTDIR)$(sysconfdir)/ibacm_addr.cfg;
- 
- dist-hook: ibacm.spec
-       cp ibacm.spec $(distdir)