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 (file)
--- a/build/lbuild-sles11
+++ b/build/lbuild-sles11
@@ -63,9 +63,10 @@ unpack_linux_devel_rpm-sles11() {
     local rpmdir="${callers_rpm%/*}"
 
     local kernelrpm
     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
     # 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
 
         fatal 1 "Could not find the kernel-default-base in $rpmdir/"
     fi