refresh

diff --git a/meta b/meta
index ba8fd6f664c4daf4c3bac1e66fe8a41bbf0a3f2a..195cc4a0febc6ca151079516c8f39118d8a80dc4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 756dfa9fa8d736b41a3225b518db4827c978a6a2
-Head: f74d7eafb22718b68facaa180413b44f2b5854d3
+Previous: 9862cb07f323b1a8e4cf8686a90bdb345e94bf67
+Head: 44965ddd9e9685b7ae37c1b260c020a05491353c
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
   file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
-  init-script: 84d8d047a7b312fd84f9e34b1f8c57211c2064d3
-  refresh-temp: f74d7eafb22718b68facaa180413b44f2b5854d3
+  init-script: 44965ddd9e9685b7ae37c1b260c020a05491353c
 Unapplied:
   fixup-man: 299df9b474d21a5bf1f9aa103248198e4198eefd
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/init-script b/patches/init-script
index 526b09ba9cd27ed5e137eb74f2250810f49ceda6..acd39abe89f188acb19d97a449ebb1e9960d1c6d 100644 (file)
--- a/patches/init-script
+++ b/patches/init-script
@@ -1,5 +1,5 @@
 Bottom: f12645dfa0a12d7006a65beabc21e55ad5dd4037
-Top:    dd59f622c11eb9c1163e20f31e354f0b88b7d058
+Top:    c1aca0f88d2afc0c41e794605279c70648ac5e8b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-22 10:26:25 -0700
 
@@ -13,6 +13,32 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/Makefile.am b/Makefile.am
+index 2e71faa..ccd48a1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,16 +18,16 @@ man_MANS = \
+       man/ibacm.1 \
+       man/ibacm.7
+ 
+-EXTRA_DIST = src/acm_mad.h src/libacm.h \
+-           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) acm_opts.cfg \
+-           acm_addr.cfg
++EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init \
++           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) ibacm_opts.cfg \
++           ibacm_addr.cfg
+ 
+ install-exec-hook:
+       if ! test -d $(DESTDIR)$(sysconfdir); then \
+               mkdir -p $(DESTDIR)$(sysconfdir); \
+       fi; \
+-      install -m 644 acm_opts.cfg $(DESTDIR)$(sysconfdir)/acm_opts.cfg; \
+-      install -m 644 acm_addr.cfg $(DESTDIR)$(sysconfdir)/acm_addr.cfg;
++      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/ibacm.init b/ibacm.init
 new file mode 100644
 index 0000000..8f863eb
@@ -151,3 +177,11 @@ index ac7f06f..6e7f8e4 100644
  daemon, but it does have a socket that it listens on, and it has a
  specific protocol for incoming/outgoing data.  So if you wish to build
  the ability to communicate directly with ib_acm into your own application,
+diff --git a/acm_addr.cfg b/ibacm_addr.cfg
+similarity index 100%
+rename from acm_addr.cfg
+rename to ibacm_addr.cfg
+diff --git a/acm_opts.cfg b/ibacm_opts.cfg
+similarity index 100%
+rename from acm_opts.cfg
+rename to ibacm_opts.cfg

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9f84c2d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,43 +0,0 @@
-Bottom: dd59f622c11eb9c1163e20f31e354f0b88b7d058
-Top:    c1aca0f88d2afc0c41e794605279c70648ac5e8b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 15:46:03 -0700
-
-Refresh of init-script
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 2e71faa..ccd48a1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,16 +18,16 @@ man_MANS = \
-       man/ibacm.1 \
-       man/ibacm.7
- 
--EXTRA_DIST = src/acm_mad.h src/libacm.h \
--           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) acm_opts.cfg \
--           acm_addr.cfg
-+EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init \
-+           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) ibacm_opts.cfg \
-+           ibacm_addr.cfg
- 
- install-exec-hook:
-       if ! test -d $(DESTDIR)$(sysconfdir); then \
-               mkdir -p $(DESTDIR)$(sysconfdir); \
-       fi; \
--      install -m 644 acm_opts.cfg $(DESTDIR)$(sysconfdir)/acm_opts.cfg; \
--      install -m 644 acm_addr.cfg $(DESTDIR)$(sysconfdir)/acm_addr.cfg;
-+      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/acm_addr.cfg b/ibacm_addr.cfg
-similarity index 100%
-rename from acm_addr.cfg
-rename to ibacm_addr.cfg
-diff --git a/acm_opts.cfg b/ibacm_opts.cfg
-similarity index 100%
-rename from acm_opts.cfg
-rename to ibacm_opts.cfg