From 01fa381a53d5a818823ecc0cf9d7cc8ee798a7ef Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Fri, 13 Aug 2010 19:03:10 +0400 Subject: [PATCH] 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. --- build/lbuild-sles10 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 1.8.3.1