From d399dee6f5c9ad1584ae00ee4f2da3e94ec07c5a Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Tue, 7 Jul 2009 02:34:08 +0000
Subject: [PATCH] Branch b_release_1_8_1 b=20009

i=brian, wangyb

Fixes for sles11 patchless build.
---
 build/lbuild-sles11 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/lbuild-sles11 b/build/lbuild-sles11
index 28f1e65..a0e974f 100644
--- a/build/lbuild-sles11
+++ b/build/lbuild-sles11
@@ -57,6 +57,10 @@ unpack_linux_devel_rpm-sles11() {
 
     local kernelrpm
     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
-- 
1.8.3.1