From: johann <johann>
Date: Wed, 1 Jul 2009 20:43:31 +0000 (+0000)
Subject: Branch b1_8
X-Git-Tag: v1_9_220~67
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=639aff7a57c022f49dee3769213679dc783ee56a

Branch b1_8
b=20009
i=wangyb (patch from yangsheng)

Fix "invalid module format" error on patchless clients.
---

diff --git a/build/lbuild-sles11 b/build/lbuild-sles11
index 18fa654..528443c 100644
--- a/build/lbuild-sles11
+++ b/build/lbuild-sles11
@@ -63,9 +63,10 @@ unpack_linux_devel_rpm-sles11() {
     local rpmdir="${callers_rpm%/*}"
 
     local kernelrpm
+    local wanted_kernel="${lnxmaj}.${lnxrel}"
     # this is a hack that should go away when the modified lustre kernel
     # Provides kernel-default-base                        vvvvvvvvv
-    if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-base ="); then
+    if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-base = $wanted_kernel"); then
         fatal 1 "Could not find the kernel-default-base in $rpmdir/"
     fi