LU-11790 ldiskfs: add terminating u32 when expanding inodes

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

diff --git a/contrib/lbuild/lbuild-rhel6 b/contrib/lbuild/lbuild-rhel6
index 137aaf2..ea5f025 100644 (file)
--- a/contrib/lbuild/lbuild-rhel6
+++ b/contrib/lbuild/lbuild-rhel6
@@ -29,17 +29,15 @@ 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-%{_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'\
+           -e "/rm -f include\/generated\/kernel.cross/i\\
+  # lustre kernel config.\\
+  if [ -f %{_topdir}/lustre/lustre/kernel_patches/kernel_configs/kernel-%{version}-$TARGET-%{_target_cpu}.config ]; then\\
+    echo \"# \$Arch\" > configs/kernel-%{version}-%{_target_cpu}.config\\
+    cat %{_topdir}/lustre/lustre/kernel_patches/kernel_configs/kernel-%{version}-$TARGET-%{_target_cpu}.config >> configs/kernel-%{version}-%{_target_cpu}.config\\
+  fi"\
           SPECS/$SPEC_NAME 2>&1 || \
         fatal 1 "Error while editing SPECS/$SPEC_NAME"
 
-
     return 0
 
 }
@@ -68,7 +66,7 @@ get_rpmbuildopts() {
 find_linux_rpm-rhel6() {
     local prefix="$1"
     local wanted_kernel="$2"
-    local pathtorpms=${3:-"${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}/${TARGET_ARCH}"}
+    local pathtorpms=${3:-"$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH"}
 
     find_linux_rpm-rhel "$prefix" "$wanted_kernel" "$pathtorpms"
 
@@ -76,6 +74,12 @@ find_linux_rpm-rhel6() {
 
 kernel_srpm_location() {
 
-    echo "ftp://ftp.redhat.com/pub/redhat/linux/enterprise/6Server/en/os/SRPMS/"
+    echo "http://ftp.redhat.com/pub/redhat/linux/enterprise/6Server/en/os/SRPMS/"
+
+}
+
+kernel_debuginfo_location() {
+
+       echo "http://debuginfo.centos.org/6/x86_64/"
 
 }