# 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"
# 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 || \
# 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
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