LU-388 modify kernel-ib spec file for openib RPM

The kernel-ib RPM from OFED 1.5.3.1 conflicts with RHEL5's
openib package.  Consider RHEL5's userspace as canonical and
Remove the conflicting portions from the kernel-ib RPM.

Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
Change-Id: I9f6a768bc5ac30fdab589c1bdbc3154fa31c1405
Reviewed-on: http://review.whamcloud.com/981
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Michael MacDonald <mjmac@whamcloud.com>
Tested-by: Hudson
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/build/lbuild b/build/lbuild
index 0c05cfd..3abf846 100755 (executable)
--- a/build/lbuild
+++ b/build/lbuild
@@ -1036,7 +1036,7 @@ build_kernel_ib() {
         rpm --define "_topdir ${TOPDIR}" -ivh $SOURCE
         SOURCE="${TOPDIR}/SPECS/ofa_kernel.spec"
         local file ed_fragment1 ed_fragment2 n=1
-        for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*); do
+        for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*.patch); do
             ed_fragment1="$ed_fragment1
 Patch$n: ${file%%*/}"
             ed_fragment2="$ed_fragment2
@@ -1044,6 +1044,11 @@ Patch$n: ${file%%*/}"
             cp $file ${TOPDIR}/SOURCES
             let n=$n+1
         done
+        for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*.ed); do
+            ed_fragment3="$ed_fragment3
+$(cat $file)"
+            let n=$n+1
+        done
 
         if [ $n -gt 1 ]; then
             ed $SOURCE <<EOF
@@ -1053,6 +1058,7 @@ $ed_fragment1
 /^%setup /a
 $ed_fragment2
 .
+$ed_fragment3
 wq
 EOF
         fi

diff --git a/build/patches/ofed/01-play-nice-with-RHEL5.ed b/build/patches/ofed/01-play-nice-with-RHEL5.ed
new file mode 100644 (file)
index 0000000..e9e5db8
--- /dev/null
+++ b/build/patches/ofed/01-play-nice-with-RHEL5.ed
@@ -0,0 +1,11 @@
+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