refresh (create temporary patch)

diff --git a/meta b/meta
index 7faf321f943966a0796189b845213fbb204dafbd..fe50fecb4d5d3ce62f7757667a6de4fbac1ca495 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 83b5641c30df7732a6700898381523b66cc76c72
-Head: 4e81c747fe40d345649d014e5f0066fab2f9ff04
+Previous: 286f4ceb9b47039526201b31918764e76924cb1a
+Head: e76d80dff63babbb1d18e15e341d67833a2c983f
 Applied:
   ibacm-script: 4e81c747fe40d345649d014e5f0066fab2f9ff04
+  refresh-temp: e76d80dff63babbb1d18e15e341d67833a2c983f
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..4ad2be2
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,27 @@
+Bottom: 0867c5d0444f4129fc5515396990e5bb2451a666
+Top:    52a78beedb874ff7c0ebb39a350280120fc346b2
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-06-28 14:40:42 -0700
+
+Refresh of ibacm-script
+
+---
+
+diff --git a/configure.in b/configure.in
+index 7b63d83..06b2590 100644
+--- a/configure.in
++++ b/configure.in
+@@ -64,7 +64,12 @@ if test "x$rdmadir" = "x"; then
+    AC_SUBST(rdmadir, rdma)\r
+ fi\r
+ AC_SUBST(sbindir)\r
+-AC_SUBST(rdmascript, openibd)\r
++\r
++if test -n "`grep -q 'release 6' /etc/redhat-release`"; then\r
++      AC_SUBST(rdmascript, rdma)\r
++else\r
++      AC_SUBST(rdmascript, openibd)\r
++fi\r
+ \r
+ AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])\r
+ AC_OUTPUT