From: Brian J. Murrell <brian.murrell@oracle.com>
Date: Mon, 28 Jun 2010 16:33:30 +0000 (-0400)
Subject: b=23185 check for both arches
X-Git-Tag: v1_8_3_57~9
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=37014e92c1ad72ec417d4ec5c03d68f8a2f522eb;p=fs%2Flustre-release.git

b=23185 check for both arches

When we build our version of the SLES kernel, we optimize it for i686
whereas the SUSE kernel is i386.  The actual arch makes a difference in
where the Module.symvers can be found, so just look in both locations
to cover both the upstream vendor kernel as well as our patched kernel.
---

diff --git a/build/lbuild-sles10 b/build/lbuild-sles10
index d278e06..1f32ee7 100644
--- a/build/lbuild-sles10
+++ b/build/lbuild-sles10
@@ -59,7 +59,7 @@ unpack_linux_devel_rpm-sles10() {
 
     # now just sanity check that everything needed to build properly versioned
     # modules is in place
-    if [ ! -f usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$(resolve_arch $TARGET_ARCH)/$RPMSMPTYPE/Module.symvers ]; then
+    if [ ! -f usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$(resolve_arch $TARGET_ARCH)/$RPMSMPTYPE/Module.symvers && ! -f usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$TARGET_ARCH/$RPMSMPTYPE/Module.symvers ]; then
         fatal 1 "cannot build kernel modules: the Kernel's Module.symvers is missing."
     fi
     if [ ! -f boot/symsets-${lnxmaj}${lnxmin}-${lnxrel}-$RPMSMPTYPE.tar.gz ]; then