X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flbuild-rhel;h=0aa22ce1767120eeb31159b16258fcfe393eb47e;hb=f40494c72908d2fafd652c16cb8c093a981eb679;hp=3ad89d8107cf8cbbabd4f1db19c9688e67e3f4b4;hpb=98bf9c9e3ecaa6736dcb066d0c76e20610fa9725;p=fs%2Flustre-release.git

diff --git a/build/lbuild-rhel b/build/lbuild-rhel
index 3ad89d8..0aa22ce 100644
--- a/build/lbuild-rhel
+++ b/build/lbuild-rhel
@@ -5,7 +5,8 @@
 # to force a kernel build on all distributions, update the BUILD_GEN variable
 # in build/lbuild)
 #BUILD_GEN+=".0"
-BUILD_GEN+=".1"	# refactor both rhel5 and rhel6
+#BUILD_GEN+=".1"	# refactor both rhel5 and rhel6
+BUILD_GEN+=".0"	# TT-107: don't cache the BUILD dir (reset major to 5)
 
 DEVEL_KERNEL_TYPE="devel"
 RPM_HELPERS_DIR="/usr/lib/rpm/redhat"
@@ -20,8 +21,7 @@ get_rpmbuildopts() {
 # patching common to all releases
 patch_spec_common() {
 
-    sed -i -e 's/^\(%define signmodules \).*/\10/' \
-           -e '/find $RPM_BUILD_ROOT\/lib\/modules\/$KernelVer/a\
+    sed -i -e '/find $RPM_BUILD_ROOT\/lib\/modules\/$KernelVer/a\
     cp -a fs/ext3/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/fs/ext3 \
     cp -a fs/ext4/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/fs/ext4' \
           SPECS/$SPEC_NAME 2>&1 || \
@@ -94,7 +94,9 @@ prepare_and_build_srpm() {
     fi
 
     # XXX - need to figure this kabichk crap out -- it fails the build
-    rpmbuildopt="$rpmbuildopt --without kabichk"
+    if ! $USE_KABI; then
+        rpmbuildopt="$rpmbuildopt --without kabichk"
+    fi
 
     # get any release specific build options
     rpmbuildopt="$rpmbuildopt $(get_rpmbuildopts)"
@@ -108,6 +110,15 @@ prepare_and_build_srpm() {
         return 1
     fi
 
+    # 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:"
+    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
 
 }