refresh (create temporary patch)

diff --git a/meta b/meta
index 527aeaded209935e2d939a6cb2b74ac2affa206e..d65acfcde0b11e84a80950a08d20db742043def0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 7b1c4e1156a5e01d51c7edacd16ab44545d94367
-Head: 354b26ab27e2f12052770a110f24f6358d263ee6
+Previous: f37802e7c7600b8ab72776d2097cab852dca3a52
+Head: 9e24a9e0e3695b33b5581845ad9253cf308ee81c
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 354b26ab27e2f12052770a110f24f6358d263ee6
+  refresh-temp: 9e24a9e0e3695b33b5581845ad9253cf308ee81c
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..113bcb6
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,49 @@
+Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
+Top:    152d5d5b6582071e2ab5e568c69cde834b40b241
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-03-01 16:43:51 -0800
+
+Refresh of rename-ibacm
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 503ad72..2e71faa 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,10 +3,10 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE
+ 
+ bin_PROGRAMS = util/ib_acme
+-sbin_PROGRAMS = svc/ib_acm
+-svc_ib_acm_SOURCES = src/acm.c
++sbin_PROGRAMS = svc/ibacm
++svc_ibacm_SOURCES = src/acm.c
+ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_linux.c src/parse.c
+-svc_ib_acm_CFLAGS = $(AM_CFLAGS)
++svc_ibacm_CFLAGS = $(AM_CFLAGS)
+ util_ib_acme_CFLAGS = $(AM_CFLAGS)
+ 
+ ibacmincludedir = $(includedir)/infiniband
+@@ -15,12 +15,19 @@ ibacminclude_HEADERS = include/infiniband/acm.h
+ 
+ man_MANS = \
+       man/ib_acme.1 \
+-      man/ib_acm.1 \
+-      man/ib_acm.7
++      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
+ 
++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;
++
+ dist-hook: ibacm.spec
+       cp ibacm.spec $(distdir)