X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Flbuild-rhel5;h=2bb418b3424caa6d31052ebf6d1006978dac440e;hp=bcf9f4a0796ad6a17491c10acc8cd6f000229c42;hb=4699065ae24652439b77e28074d5ab4f7d866a7f;hpb=b2f1b2844e09bedbc510b622223cc8f630e16b9e

diff --git a/build/lbuild-rhel5 b/build/lbuild-rhel5
index bcf9f4a..2bb418b 100644
--- a/build/lbuild-rhel5
+++ b/build/lbuild-rhel5
@@ -200,8 +200,14 @@ rpm_BUILD_kernel_dirname() {
 
 find_linux_devel_paths() {
     local path="$1"
+    local ARCH=$TARGET_ARCH
 
-    LINUX=$path/usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}-${TARGET_ARCH}
+    # If DEVEL_PATH_ARCH is set, use it. Added for fc11 as it needs i586 string for i686.
+    if [ $DEVEL_PATH_ARCH ];then
+        ARCH=$DEVEL_PATH_ARCH
+    fi
+
+    LINUX=$path/usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}${DEVEL_PATH_ARCH_DELIMETER:-"-"}${ARCH}
     # RHEL doesn't have the -obj tree
     LINUXOBJ=""
     # XXX - i don't think we need this any more