From: Sean Hefty Date: Thu, 28 Jun 2012 21:40:42 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=42550cdea59b73cfd0d0c0af4a702b326dcf47c6;p=~shefty%2Fibacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index 7faf321..fe50fec 100644 --- 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 index 0000000..4ad2be2 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,27 @@ +Bottom: 0867c5d0444f4129fc5515396990e5bb2451a666 +Top: 52a78beedb874ff7c0ebb39a350280120fc346b2 +Author: Sean Hefty +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) + fi + AC_SUBST(sbindir) +-AC_SUBST(rdmascript, openibd) ++ ++if test -n "`grep -q 'release 6' /etc/redhat-release`"; then ++ AC_SUBST(rdmascript, rdma) ++else ++ AC_SUBST(rdmascript, openibd) ++fi + + AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init]) + AC_OUTPUT