refresh

diff --git a/meta b/meta
index 39e9573c2ae6080752e1dbb36a0591c66b5676ac..b6ff8d06c7149547c10ff7fe42e709fc5f23c47d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: ec84279043ebe33777e1757455605232c969251b
-Head: d253b0cea29a0f7a1cf6479ff62c9109dbafacd6
+Previous: 94a038c6e7f69f5934951c9f26e1a911c99cfb96
+Head: 1e9fcfee450ca11bdb5cbcab7e4024f14deccf31
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
-  dist-cfg: cf72166733b90783b79a01db0eec8c7e39392a7a
-  refresh-temp: d253b0cea29a0f7a1cf6479ff62c9109dbafacd6
+  dist-cfg: 1e9fcfee450ca11bdb5cbcab7e4024f14deccf31
 Unapplied:
   1.0.4: fef38bbaaa183e1fcbeb96f0229f9bf2360c78e6
 Hidden:

diff --git a/patches/dist-cfg b/patches/dist-cfg
index 212a100733214434d066a65400fb28db6423e215..4524fa7e291034bac36bb850151a9d68f37ca801 100644 (file)
--- a/patches/dist-cfg
+++ b/patches/dist-cfg
@@ -1,5 +1,5 @@
 Bottom: 2ade29ce3f23fc9eb785f9810ca0b437d7a23a8c
-Top:    2ade29ce3f23fc9eb785f9810ca0b437d7a23a8c
+Top:    373094ca753531b7dc76712d64a4a7efec7212b5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-30 19:31:04 -0800
 
@@ -13,4 +13,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/Makefile.am b/Makefile.am
+index f443091..957b016 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,8 @@ man_MANS = \
+       man/ib_acm.7
+ 
+ EXTRA_DIST = include/infiniband/acm.h src/acm_mad.h src/acm_msg.h src/libacm.h \
+-           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
++           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) acm_opts.cfg \
++           acm_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 03b4fb8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 2ade29ce3f23fc9eb785f9810ca0b437d7a23a8c
-Top:    373094ca753531b7dc76712d64a4a7efec7212b5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-30 19:32:45 -0800
-
-Refresh of dist-cfg
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index f443091..957b016 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,8 @@ man_MANS = \
-       man/ib_acm.7
- 
- EXTRA_DIST = include/infiniband/acm.h src/acm_mad.h src/acm_msg.h src/libacm.h \
--           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
-+           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) acm_opts.cfg \
-+           acm_addr.cfg
- 
- dist-hook: ibacm.spec
-       cp ibacm.spec $(distdir)