X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flbuild-rhel;h=efb5c816452869ed91af079de4e46478c4fde303;hb=b7f949e04bbd4533316f0ca09b4b7d4f1765eca1;hp=082476bc34932af3eb4ba13153bb270f01321028;hpb=1d95408cfbacf7462314325996d3cdf087764266;p=fs%2Flustre-release.git

diff --git a/build/lbuild-rhel b/build/lbuild-rhel
index 082476b..efb5c81 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 || \
@@ -113,7 +113,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
 
@@ -191,7 +195,9 @@ find_linux_rpm-rhel() {
     if [ "$(lsb_release -s -i)" = "RedHatEnterpriseServer" ]; then
         sudo="sudo"
     fi
-    $sudo yumdownloader --destdir "$tmpdir" kernel-devel-"$wanted_kernel" > /dev/null
+    if ! $sudo yumdownloader --destdir "$tmpdir" kernel-devel-"$wanted_kernel" > /dev/null; then
+        fatal 1 "failed to fetch kernel-devel-$wanted_kernel with yumdownloader."
+    fi
     local rpm=$(cd $tmpdir; echo *)
     mv "$tmpdir/$rpm" "$pathtorpms"
     rmdir $tmpdir