LU-12575 build: add ibutils2 for MOFED build

MOFED 4.6 include ibutils2 instead of ibutils
Remove ofed rhel5 patch which we don't need

Change-Id: I46c51eb8a194ea86bd8c951944e5c1427d0f37d0
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/35590
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 6a1ab0a..2d07009 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1259,7 +1259,7 @@ build_kernel_ib() {
         rpm --define "_topdir ${TOPDIR}" -ivh $SOURCE
         SOURCE="${TOPDIR}/SPECS/${kib_prefix}.spec"
         local file ed_fragment1 ed_fragment2 n=1
-        for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.patch); do
+        for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.patch 2>/dev/null); do
             ed_fragment1="$ed_fragment1
 Patch$n: ${file%%*/}"
             ed_fragment2="$ed_fragment2
@@ -1267,7 +1267,7 @@ Patch$n: ${file%%*/}"
             cp $file ${TOPDIR}/SOURCES
             let n=$n+1
         done
-        for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.ed); do
+        for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.ed 2>/dev/null); do
             # Only apply the ed-scripts that should be used for the canonical target
             # ed-files in ${TOPDIR}/lustre/contrib/patches/ofed/ have to follow the naming
             # convention
@@ -1327,7 +1327,7 @@ EOF
                fi
                # now that we have the kernel rpms, we need to lib rpms too
                # we don't have to rebuild since MOFED include the binaries
-               cp -f OFED_RPMS/{libibmad-*,libibverbs-*,libibumad-*,librdmacm*,ibutils-*,opensm-*}.${TARGET_ARCH}.rpm \
+               cp -f OFED_RPMS/{libibmad-*,libibverbs-*,libibumad-*,librdmacm*,ibutils*,opensm-*}.${TARGET_ARCH}.rpm \
                        ${TOPDIR}/RPMS/${TARGET_ARCH} || \
                        fatal 1 "Failed to copy MOFED rpms"
                ;;

diff --git a/contrib/patches/ofed/01-dont-include-openib-initscript-rhel5.ed b/contrib/patches/ofed/01-dont-include-openib-initscript-rhel5.ed
deleted file mode 100644 (file)
index e9e5db8..0000000
--- a/contrib/patches/ofed/01-dont-include-openib-initscript-rhel5.ed
+++ /dev/null
@@ -1,11 +0,0 @@
-1
-/^%define include_udev_rules/s/%(eval.*$/0/
-/    \/sbin\/depmod.* %{KVERSION}/i
-deletetohere
-.
-?%post -n kernel-ib
-+,/deletetohere/d
-+,/# END of post -n kernel-ib/d
-/%preun -n kernel-ib/,/^fi$/d
-/%postun -n kernel-ib/,/%postun -n kernel-ib-devel/d
-g/^\/etc\/init.d\/openibd$/d