X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flbuild-rhel6;h=fb2afb7674397d77b23ea63701e0c31dbc5df1b0;hb=b0f08a4e902411a8fbdb660e5b32c5821ca7159f;hp=dcd174a15c60277b396958f5f3872e0eef4e1519;hpb=97497da3c6409988c19089aaa1afbbc212868283;p=fs%2Flustre-release.git

diff --git a/build/lbuild-rhel6 b/build/lbuild-rhel6
index dcd174a..fb2afb7 100644
--- a/build/lbuild-rhel6
+++ b/build/lbuild-rhel6
@@ -8,12 +8,13 @@
 #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+=".1"	# LU-1361: enable kernel ABI
 
 source ${0%/*}/lbuild-rhel
 
 SPEC_NAME="kernel.spec"
 DEVEL_PATH_ARCH_DELIMETER="."
+USE_KABI=true
 
 patch_spec() {
     local buildid="$1"
@@ -30,9 +31,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 || \