X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flbuild-sles;h=e61b27fe459f51f93f3cd046417787e2ad8a5d08;hb=69efa174743f5ad2425c0ccd951961ae356fed0d;hp=1e3902d2097a48616758d53a8cb60d806f32b13d;hpb=16e2585002015db921850819874e9696b2775c19;p=fs%2Flustre-release.git

diff --git a/build/lbuild-sles b/build/lbuild-sles
index 1e3902d2..e61b27f 100644
--- a/build/lbuild-sles
+++ b/build/lbuild-sles
@@ -1,5 +1,9 @@
 # vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
 
+# increment this if you have made a change that should force a new kernel
+# to build built
+BUILD_GEN+=".0"	# TT-107: don't cache the BUILD dir (reset major to 5)
+
 DEVEL_KERNEL_TYPE="source"
 RPM_HELPERS_DIR="/usr/lib/rpm"
 
@@ -86,11 +90,20 @@ rpm_BUILD_kernel_dirname() {
 
 resolve_arch() {
     local arch="$1"
+    # because we build an i686 kernel, we need to know if the arch we are
+    # resolving for is for the patched or patchless kernel (which is i586)
+    # we really should be building an i586 kernel to match what Novell does
+    local for_patchless=${2:-true}
+    local canonical=${3:-false}
 
     case $arch in
         ppc64)	arch=powerpc
                 ;;
-        i686)	arch=i386
+        i?86)	if $canonical; then
+                    arch=i386
+                elif $(eval $for_patchless); then
+                    arch=i586
+                fi
                 ;;
     esac
 
@@ -102,7 +115,7 @@ find_linux_devel_paths() {
     local path="$1"
 
     LINUX=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}
-    LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$(resolve_arch $TARGET_ARCH)/$RPMSMPTYPE
+    LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$(resolve_arch $TARGET_ARCH $PATCHLESS)/$RPMSMPTYPE
     # XXX this has been commented out in th rhel5 build file for a while
     # as it says there, it's probably not needed anymore and can be deleted
     #LINUXRELEASE=$(find_linux_release "$LINUXOBJ")