From: Brian J. Murrell <brian@whamcloud.com>
Date: Tue, 3 May 2011 19:57:21 +0000 (-0400)
Subject: LU-301 bump kernel version for sles11
X-Git-Tag: 2.0.61.0~14
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=8a597511df4cca5472b3b93be5da5d349ff51b80

LU-301 bump kernel version for sles11

We need to provide the same "self service" love in lbuild for sles11
(client only) building.

May as well bump the supported kernel to the latest while I'm at it.

Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
Change-Id: I84617f429b0cef23a24fe161158580917ffe3041
Reviewed-on: http://review.whamcloud.com/482
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Michael MacDonald <mjmac@whamcloud.com>
Reviewed-by: Chris Gearing <chris@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/build/lbuild-sles11 b/build/lbuild-sles11
index cdbe33e..6b6b36d 100644
--- a/build/lbuild-sles11
+++ b/build/lbuild-sles11
@@ -75,4 +75,28 @@ unpack_linux_devel_rpm-sles11() {
         fatal 1 "Unpack error for $kernelrpm"
     fi
 
+    if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-devel = $wanted_kernel"); then
+        fatal 1 "Could not find the kernel-default-devel in $rpmdir/"
+    fi
+
+    if ! rpm2cpio < "$rpmdir/$kernelrpm" | cpio -id > /dev/null 2>&1; then
+        fatal 1 "Unpack error for $kernelrpm"
+    fi
+
+}
+
+find_linux_rpm-sles11() {
+    local prefix="$1"
+    local wanted_kernel="$2"
+    local pathtorpms=${3:-"${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}/${TARGET_ARCH}"}
+
+    # what, oh what, do we do for sles11?
+    # if anyone knows how we get an arbitrary (kernel-source and
+    # kernel-default-base in this case) from the Suse update mechanism,
+    # please feel free to fix this
+
+    fatal 1 "I don't know how to get packages for SLES11"
+
+    return 0
+
 }
diff --git a/lustre/kernel_patches/targets/2.6-sles11.target.in b/lustre/kernel_patches/targets/2.6-sles11.target.in
index a5a8c10..85e8606 100644
--- a/lustre/kernel_patches/targets/2.6-sles11.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles11.target.in
@@ -1,10 +1,10 @@
-lnxmaj="2.6.27"
-lnxmin=".23"
-lnxrel="0.1"
+lnxmaj="2.6.32"
+lnxmin=".36"
+lnxrel="0.5"
 # use this when there is an "RPM fix" which means that the name of the
 # (source) RPM has been updated but the version of the kernel inside the
 # RPM is not also updated
-#rpmfix=".1"
+rpmfix=".2"
 
 # this is the delimeter that goes before the "smp" at the end of the version
 # defaults to empty
@@ -16,7 +16,7 @@ VERSION=$lnxmaj
 EXTRA_VERSION="${lnxmin#.}-${lnxrel}_lustre.@VERSION@"
 LUSTRE_VERSION=@VERSION@
 
-OFED_VERSION=1.5.1
+OFED_VERSION=inkernel
 
 BASE_ARCHS="i686 ppc x86_64 ia64 ppc64"
 BIGMEM_ARCHS=""