refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..9f84c2d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,43 @@
+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