commit

diff --git a/meta b/meta
index 324d2f3b3852a7cfbc94d0b56c4ab343f6bd11a3..875126c00900bafaafb599bf99d4727d4602c895 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 6efc7957def37fd87df6f86afb973f68b7a3d80f
+Previous: 81e73f810f989eb5d1dde07b75177228588a7462
 Head: b3c6c41bfef82dc8a06afe4f1e874bf33a14b1b4
 Applied:
-  ibacm-script: b269c99716b03631d584d0ebd11c2a7af0b402c4
   v1.0.7: b3c6c41bfef82dc8a06afe4f1e874bf33a14b1b4
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/ibacm-script b/patches/ibacm-script
deleted file mode 100644 (file)
index 52f3b7e..0000000
--- a/patches/ibacm-script
+++ /dev/null
@@ -1,50 +0,0 @@
-Bottom: 06764dc11f67f3be9812eb13647311940c17a4d5
-Top:    56c3b57e8f6b69f8876e34fb297f7585eeb1421d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-06 16:10:22 -0700
-
-Configure init script based on target OS
-
-The init script either needs to depend on 'rdma' or 'openibd'
-scripts being started.  The actual script depends on the target
-operating system.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/configure.in b/configure.in
-index 063b834..57bdbcd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -65,5 +65,14 @@ if test "x$rdmadir" = "x"; then
- fi\r
- AC_SUBST(sbindir)\r
- \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
- AC_OUTPUT\r
-diff --git a/ibacm.init.in b/ibacm.init.in
-index b4e807f..bd2d1bd 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -9,8 +9,8 @@
- # Provides:       ibacm
- # Default-Start: 2 3 4 5
- # Default-Stop: 0 1 6
--# Required-Start: rdma $network
--# Required-Stop: rdma $network
-+# Required-Start: @rdmascript@ $network
-+# Required-Stop: @rdmascript@ $network
- # Should-Start:
- # Should-Stop:
- # Short-Description: Starts and stops the InfiniBand ACM service