X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=build%2Flbuild-sles11;h=2e4185cf524b845e0b86683be4c2950a550cf3b6;hb=3dcf18d393b990e143fbb11fba2ec6137b7b8b43;hp=528443cb371e9a7348344f9d507741651b7a1682;hpb=639aff7a57c022f49dee3769213679dc783ee56a;p=fs%2Flustre-release.git

diff --git a/build/lbuild-sles11 b/build/lbuild-sles11
index 528443c..2e4185c 100644
--- a/build/lbuild-sles11
+++ b/build/lbuild-sles11
@@ -63,7 +63,11 @@ unpack_linux_devel_rpm-sles11() {
     local rpmdir="${callers_rpm%/*}"
 
     local kernelrpm
-    local wanted_kernel="${lnxmaj}.${lnxrel}"
+    local wanted_kernel="${lnxmaj}${lnxmin}${TARGET_DELIMITER}${lnxrel}"
+    if $PATCHLESS; then
+# this $PATCHLESS block should go away when bug 19336 lands.
+        wanted_kernel="${lnxmaj}${lnxmin}${TARGET_DELIMITER}${real_lnxrel}"
+    fi
     # 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 = $wanted_kernel"); then