LU-653 Ignore last transno from clients with no outstanding transactions

[fs/lustre-release.git] / build / lbuild-rhel

diff --git a/build/lbuild-rhel b/build/lbuild-rhel
index 5b80742..87e4815 100644 (file)
--- 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"
@@ -94,7 +95,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)"
@@ -111,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