LU-781 kernel: kernel update [RHEL6.2 2.6.32-220]

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

diff --git a/build/lbuild-rhel6 b/build/lbuild-rhel6
index dcd174a..3e570c5 100644 (file)
--- a/build/lbuild-rhel6
+++ b/build/lbuild-rhel6
@@ -7,8 +7,7 @@
 # distributions, update the BUILD_GEN variable in build/lbuild)
 #BUILD_GEN+=".0"
 #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)
-BUILD_GEN+=".1"        # LU-50: kernel: configurable BH LRU size
+BUILD_GEN+=".0"        # TT-107: don't cache the BUILD dir (reset major to 5)
 
 source ${0%/*}/lbuild-rhel
 
@@ -30,9 +29,9 @@ 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\
+  if [ -f %{_topdir}/lustre/lustre/kernel_patches/kernel_configs/kernel-%{version}-2.6-rhel6-%{_target_cpu}.config ]; then\
+    echo "# $Arch" > configs/kernel-%{version}-%{_target_cpu}.config\
+    cat %{_topdir}/lustre/lustre/kernel_patches/kernel_configs/kernel-%{version}-2.6-rhel6-%{_target_cpu}.config >> configs/kernel-%{version}-%{_target_cpu}.config\
   fi'\
            -e '/^# Dynamically generate kernel/a echo "CONFIG_BH_LRU_SIZE=16" >> config-generic'\
           SPECS/$SPEC_NAME 2>&1 || \