From: James Simmons <uja.ornl@gmail.com>
Date: Mon, 8 Oct 2012 13:34:22 +0000 (-0400)
Subject: LU-1691 kernel: kernel update [SLES11 SP2 3.0.34-0.7.9]
X-Git-Tag: 2.3.54~73
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=fc7e0f430a175e258af128e01945b95180fd9c66

LU-1691 kernel: kernel update [SLES11 SP2 3.0.34-0.7.9]

Add SLES11 SP2 client support to 3.0.34-0.7.9.

Allow 2.6 (SP1) and 3.0 (SP2) clients to be built for SLES11
Standard lbuild will build for the kernel version that builder
is using, this can be overridden by specifying the target
directly as an lbuild parameter

This change explictly does not make changes to support SLES11SP2
server

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Chris Gearing <chris.gearing@intel.com>
Signed-off-by: yang sheng <ys@whamcloud.com>
Change-Id: Iece4c0286a3f0dcd28fe96e03a8aec9bda065ed5
Reviewed-on: http://review.whamcloud.com/3734
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/build/funcs.sh b/build/funcs.sh
index 268d84d..0a1571f2 100644
--- a/build/funcs.sh
+++ b/build/funcs.sh
@@ -184,7 +184,7 @@ autodetect_target() {
          rhel5) target="2.6-rhel5";;
          rhel6) target="2.6-rhel6";;
         sles10) target="2.6-sles10";;
-        sles11) target="2.6-sles11";;
+        sles11) target="$(uname -r | cut -d . -f 1,2)-sles11";;
           fc15) target="2.6-fc15";;
             *) fatal 1 "I don't know what distro $distro is.\nEither update autodetect_target() or use the --target argument.";;
     esac
diff --git a/build/lbuild b/build/lbuild
index 72bac12..58bf239 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -321,7 +321,7 @@ check_options() {
         2.6-sles10)
             CANONICAL_TARGET="sles10-2.6"
             ;;
-        2.6-sles11)
+        2.6-sles11 | 3.0-sles11)
             CANONICAL_TARGET="sles11"
             ;;
         2.6-oel5)
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index c8cc45f..bee849c 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2471,6 +2471,7 @@ lustre/kernel_patches/targets/2.6-rhel6.target
 lustre/kernel_patches/targets/2.6-rhel5.target
 lustre/kernel_patches/targets/2.6-sles10.target
 lustre/kernel_patches/targets/2.6-sles11.target
+lustre/kernel_patches/targets/3.0-sles11.target
 lustre/kernel_patches/targets/2.6-oel5.target
 lustre/kernel_patches/targets/2.6-fc11.target
 lustre/kernel_patches/targets/2.6-fc12.target
diff --git a/lustre/kernel_patches/series/3.0-sles11.series b/lustre/kernel_patches/series/3.0-sles11.series
new file mode 100644
index 0000000..de1a254
--- /dev/null
+++ b/lustre/kernel_patches/series/3.0-sles11.series
@@ -0,0 +1,3 @@
+# This file is a place holder for the patch series file
+# The correct patches will be placed in here for SLES-SP2 3.x kernel server build
+# The changes for SLES server are beyond the scope of change request LU-1691
diff --git a/lustre/kernel_patches/targets/3.0-sles11.target.in b/lustre/kernel_patches/targets/3.0-sles11.target.in
new file mode 100644
index 0000000..241984f
--- /dev/null
+++ b/lustre/kernel_patches/targets/3.0-sles11.target.in
@@ -0,0 +1,37 @@
+lnxmaj="3.0"
+lnxmin=".34"
+lnxrel="0.7"
+# 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=".9"
+
+# this is the delimeter that goes before the "smp" at the end of the version
+# defaults to empty
+FLAVOR_DELIMITER="-"
+
+KERNEL_SRPM=kernel-source-${lnxmaj}${lnxmin}-${lnxrel}${rpmfix}.src.rpm
+SERIES=2.6-sles11.series
+VERSION=$lnxmaj
+EXTRA_VERSION="${lnxmin#.}-${lnxrel}_lustre.@VERSION@"
+LUSTRE_VERSION=@VERSION@
+
+OFED_VERSION=inkernel
+
+BASE_ARCHS="i686 ppc x86_64 ia64 ppc64"
+BIGMEM_ARCHS=""
+BOOT_ARCHS=""
+JENSEN_ARCHS=""
+DEFAULT_ARCHS="i686 x86_64 ia64 ppc64"
+BIGSMP_ARCHS=""
+PSERIES64_ARCHS="ppc"
+UP_ARCHS=""
+SRC_ARCHS=""
+#RPMSMPTYPE="smp"
+
+for cc in gcc ; do
+    if which $cc >/dev/null 2>/dev/null ; then
+        export CC=$cc
+        break
+    fi
+done