LU-831 header: struct bit field should be unsigned type

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

diff --git a/build/lbuild-rhel6 b/build/lbuild-rhel6
index 9ac2a48..4381c3f 100644 (file)
--- a/build/lbuild-rhel6
+++ b/build/lbuild-rhel6
@@ -6,7 +6,8 @@
 # variable in build/lbuild-rhel and if you want to force kernel bulid for all
 # distributions, update the BUILD_GEN variable in build/lbuild)
 #BUILD_GEN+=".0"
-BUILD_GEN+=".1"                # added --with firmware to rpmbuild for rhel6
+#BUILD_GEN+=".1"               # added --with firmware to rpmbuild for rhel6
+BUILD_GEN+=".0"        # TT-107: don't cache the BUILD dir (reset major to 5)
 
 source ${0%/*}/lbuild-rhel
 
@@ -26,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"
 
@@ -60,14 +67,7 @@ find_linux_rpm-rhel6() {
     local wanted_kernel="$2"
     local pathtorpms=${3:-"${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}/${TARGET_ARCH}"}
 
-    local tmpdir=$(mktemp -d $pathtorpms/yumXXXXXX)
-    sudo yumdownloader --destdir "$tmpdir" kernel-devel-"$wanted_kernel" > /dev/null
-    local rpm=$(cd $tmpdir; echo *)
-    mv "$tmpdir/$rpm" "$pathtorpms"
-    rmdir $tmpdir
-    echo "$rpm"
-
-    return 0
+    find_linux_rpm-rhel "$prefix" "$wanted_kernel" "$pathtorpms"
 
 }