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>
rpm --define "_topdir ${TOPDIR}" -ivh $SOURCE
SOURCE="${TOPDIR}/SPECS/${kib_prefix}.spec"
local file ed_fragment1 ed_fragment2 n=1
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
ed_fragment1="$ed_fragment1
Patch$n: ${file%%*/}"
ed_fragment2="$ed_fragment2
cp $file ${TOPDIR}/SOURCES
let n=$n+1
done
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
# 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
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
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"
;;
${TOPDIR}/RPMS/${TARGET_ARCH} || \
fatal 1 "Failed to copy MOFED rpms"
;;
+++ /dev/null
-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