From 326c2375e58643bbef1db0de35c9201ca42cbb12 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 28 Jun 2012 14:57:59 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 9c83ba6..ca68f09 100644 --- 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 index 0000000..e61f29b --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,31 @@ +Bottom: 52a78beedb874ff7c0ebb39a350280120fc346b2 +Top: 56c3b57e8f6b69f8876e34fb297f7585eeb1421d +Author: Sean Hefty +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 + AC_SUBST(sbindir) + +-if test -n "`grep -q 'release 6' /etc/redhat-release`"; then +- AC_SUBST(rdmascript, rdma) +-else +- AC_SUBST(rdmascript, openibd) ++AC_ARG_VAR(rdmascript, [Required dependency script name]) ++if test "x$rdmascript" = "x"; then ++ if test -n "`grep -q 'release 6' /etc/redhat-release`"; then ++ AC_SUBST(rdmascript, rdma) ++ else ++ AC_SUBST(rdmascript, openibd) ++ fi + fi + + AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init]) -- 2.41.0