refresh

diff --git a/meta b/meta
index ca68f09b77063a39b775e316305070e2515b8e08..407ef15b0de757a56e95905d1cc8ef251949f80f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 7c68269c16ad7fa12b37007c7bf216cdc0893c7c
-Head: f34e98a38fc877f0a5c2443a48d123514e60db90
+Previous: cd04548bcbbb37927c33a0b2cdd0f3d8bcf30459
+Head: b269c99716b03631d584d0ebd11c2a7af0b402c4
 Applied:
-  ibacm-script: b1d3df1ab268f0d41c0b279e92ce6e90c1a20b24
-  refresh-temp: f34e98a38fc877f0a5c2443a48d123514e60db90
+  ibacm-script: b269c99716b03631d584d0ebd11c2a7af0b402c4
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/ibacm-script b/patches/ibacm-script
index 283c13542362442a7a170a5ab95895d5d155d4e4..52f3b7e57401b5e513a988b97932b70ba36354cc 100644 (file)
--- a/patches/ibacm-script
+++ b/patches/ibacm-script
@@ -1,5 +1,5 @@
 Bottom: 06764dc11f67f3be9812eb13647311940c17a4d5
-Top:    52a78beedb874ff7c0ebb39a350280120fc346b2
+Top:    56c3b57e8f6b69f8876e34fb297f7585eeb1421d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-06 16:10:22 -0700
 
@@ -15,17 +15,20 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/configure.in b/configure.in
-index 063b834..06b2590 100644
+index 063b834..57bdbcd 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -65,5 +65,11 @@ if test "x$rdmadir" = "x"; then
+@@ -65,5 +65,14 @@ 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])\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e61f29b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-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])