]> git.openfabrics.org - ~shefty/ibacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Thu, 28 Jun 2012 21:57:59 +0000 (14:57 -0700)
committerSean Hefty <sean.hefty@intel.com>
Thu, 28 Jun 2012 21:57:59 +0000 (14:57 -0700)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index 9c83ba694331da58b7dd2bc558c63c0fb6c6e279..ca68f09b77063a39b775e316305070e2515b8e08 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 2f87b82c0940e36e80cc70dd59e545accdce9820
-Head: b1d3df1ab268f0d41c0b279e92ce6e90c1a20b24
+Previous: 7c68269c16ad7fa12b37007c7bf216cdc0893c7c
+Head: f34e98a38fc877f0a5c2443a48d123514e60db90
 Applied:
   ibacm-script: b1d3df1ab268f0d41c0b279e92ce6e90c1a20b24
+  refresh-temp: f34e98a38fc877f0a5c2443a48d123514e60db90
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..e61f29b
--- /dev/null
@@ -0,0 +1,31 @@
+Bottom: 52a78beedb874ff7c0ebb39a350280120fc346b2
+Top:    56c3b57e8f6b69f8876e34fb297f7585eeb1421d
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-06-28 14:57:59 -0700
+
+Refresh of ibacm-script
+
+---
+
+diff --git a/configure.in b/configure.in
+index 06b2590..57bdbcd 100644
+--- a/configure.in
++++ b/configure.in
+@@ -65,10 +65,13 @@ if test "x$rdmadir" = "x"; then
+ fi\r
+ AC_SUBST(sbindir)\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
++AC_ARG_VAR(rdmascript, [Required dependency script name])\r
++if test "x$rdmascript" = "x"; then\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
+ fi\r
\r
+ AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])