From 4699065ae24652439b77e28074d5ab4f7d866a7f Mon Sep 17 00:00:00 2001
From: Rahul Deshmukh <Rahul.Deshmukh@Sun.COM>
Date: Wed, 3 Mar 2010 17:03:09 -0800
Subject: [PATCH 1/1] b=20738 FC11 support in Yala is needed

Added support for fc11 patchless client build on lbat

i=brain
---
 build/lbuild-fc11                                | 18 ++++++++++++++++++
 build/lbuild-rhel5                               |  8 +++++++-
 lustre.spec.in                                   |  2 +-
 lustre/autoconf/lustre-core.m4                   |  1 +
 lustre/kernel_patches/targets/2.6-fc11.target.in | 15 +++++++++++++++
 5 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 build/lbuild-fc11
 create mode 100644 lustre/kernel_patches/targets/2.6-fc11.target.in

diff --git a/build/lbuild-fc11 b/build/lbuild-fc11
new file mode 100644
index 0000000..12da985
--- /dev/null
+++ b/build/lbuild-fc11
@@ -0,0 +1,18 @@
+# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
+
+# Replace i686 with i586 for fc11.
+# Please see find_linux_devel_paths() in lbuild-rhel5 file for more details.
+if [ $TARGET_ARCH == 'i686' ]; then
+        DEVEL_PATH_ARCH="i586"
+fi
+# Please see find_linux_devel_paths() in lbuild-rhel5 file for more details.
+DEVEL_PATH_ARCH_DELIMETER="."
+source ${0%/*}/lbuild-rhel5
+
+# increment this if you have made a change that should force a new kernel
+# to build built
+#BUILD_GEN=1
+#BUILD_GEN=2	# bz19952: remove -lustre tag from kernel RPM names
+BUILD_GEN=3	# bz19975 enable the building of src.rpms by default
+
+
diff --git a/build/lbuild-rhel5 b/build/lbuild-rhel5
index bcf9f4a..2bb418b 100644
--- a/build/lbuild-rhel5
+++ b/build/lbuild-rhel5
@@ -200,8 +200,14 @@ rpm_BUILD_kernel_dirname() {
 
 find_linux_devel_paths() {
     local path="$1"
+    local ARCH=$TARGET_ARCH
 
-    LINUX=$path/usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}-${TARGET_ARCH}
+    # If DEVEL_PATH_ARCH is set, use it. Added for fc11 as it needs i586 string for i686.
+    if [ $DEVEL_PATH_ARCH ];then
+        ARCH=$DEVEL_PATH_ARCH
+    fi
+
+    LINUX=$path/usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}${DEVEL_PATH_ARCH_DELIMETER:-"-"}${ARCH}
     # RHEL doesn't have the -obj tree
     LINUXOBJ=""
     # XXX - i don't think we need this any more
diff --git a/lustre.spec.in b/lustre.spec.in
index 30fdce8..7c9f3e5 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -6,7 +6,7 @@
 
 %define is_client %(bash -c "if [[ %{lustre_name} = *-client ]]; then echo -n '1'; else echo -n '0'; fi")
 # for those uses that don't want the -smp/-bigsmp on the end of %kversion
-%define krequires %(bash -c "echo %{kversion} | sed -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
+%define krequires %(bash -c "echo %{kversion} | sed -e 's/.x86_64$//' -e 's/.i586$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
 
 Summary: Lustre File System
 Name: %{lustre_name}
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 277c22b..fdc02db 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2494,6 +2494,7 @@ lustre/kernel_patches/targets/2.6-patchless.target
 lustre/kernel_patches/targets/2.6-sles10.target
 lustre/kernel_patches/targets/2.6-sles11.target
 lustre/kernel_patches/targets/2.6-oel5.target
+lustre/kernel_patches/targets/2.6-fc11.target
 lustre/ldlm/Makefile
 lustre/fid/Makefile
 lustre/fid/autoMakefile
diff --git a/lustre/kernel_patches/targets/2.6-fc11.target.in b/lustre/kernel_patches/targets/2.6-fc11.target.in
new file mode 100644
index 0000000..65cd561
--- /dev/null
+++ b/lustre/kernel_patches/targets/2.6-fc11.target.in
@@ -0,0 +1,15 @@
+lnxmaj="2.6.29.4"
+lnxrel="167.fc11"
+
+KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
+SERIES=2.6-fc5.series
+EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
+LUSTRE_VERSION=@VERSION@
+BASE_ARCHS="i686 x86_64"
+BIGMEM_ARCHS=""
+BOOT_ARCHS=""
+JENSEN_ARCHS=""
+SMP_ARCHS=""
+UP_ARCHS=""
+
+
-- 
1.8.3.1