LU-469 Build with lustre own kernel config file.

-- Use lustre own rhel6 kernel config files in lbuild.
-- Rebase config files in latest vendor update.
-- Correct config file diff output.

Change-Id: I9ee5115009de5bcb00084dcac2e204774178a8c1
Signed-off-by: Yang Sheng <ys@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/1034
Tested-by: Hudson
Reviewed-by: Oleg Drokin <green@whamcloud.com>

build/lbuild-rhel

@@ -114,7 +114,11 @@ prepare_and_build_srpm() {
     # for informative purposes, display a diff between the .config that
     # was actually built and what we proposed as a .config
     echo "Diffs between $(basename $CONFIG_FILE) and the built kernel's .config:"
-    diff -u $CONFIG_FILE $TOPDIR/BUILD/kernel-${lnxmaj}-${lnxrel}/linux-${lnxmaj}-${lnxrel}.${BUILD_ARCHS# }/.config
+    local rpmname="$TOPDIR/RPMS/${BUILD_ARCHS# }/kernel-${lnxmaj}-${lnxrel}${buildid}.${BUILD_ARCHS# }.rpm"
+    rpmcfg=$(rpm -qpl $rpmname | grep '/boot/config-')
+    rpm2cpio $rpmname | cpio -id .$rpmcfg
+    diff -u $CONFIG_FILE .$rpmcfg
+    rm -rf .$rpmcfg
 
     return 0
 

build/lbuild-rhel6

@@ -27,6 +27,12 @@ Patch99995: linux-%{version}-lustre.patch' \
 # lustre patch\
 ApplyOptionalPatch linux-%{version}-lustre.patch\
 ' \
+           -e '/rm -f include\/generated\/kernel.cross/i\
+  # lustre kernel config.\
+  if [ -f %{_topdir}/lustre/lustre/kernel_patches/kernel_configs/kernel-%{version}-2.6-rhel6-$Arch.config ]; then\
+    echo "# $Arch" > configs/kernel-%{version}-$Arch.config\
+    cat %{_topdir}/lustre/lustre/kernel_patches/kernel_configs/kernel-%{version}-2.6-rhel6-$Arch.config >> configs/kernel-%{version}-$Arch.config\
+  fi'\
           SPECS/$SPEC_NAME 2>&1 || \
         fatal 1 "Error while editing SPECS/$SPEC_NAME"