From 71c142153dd13c4747bf3436ea38da260f110741 Mon Sep 17 00:00:00 2001
From: wangyb <wangyb>
Date: Thu, 18 Dec 2008 02:57:08 +0000
Subject: [PATCH] b=17922 i=sheng.yang i=brian

use real vanilla kernel config/series.
---
 ...g => kernel-2.6.22-2.6-vanilla-i686-bigsmp.config} |  0
 ...6.config => kernel-2.6.22-2.6-vanilla-i686.config} |  0
 ...ig => kernel-2.6.22-2.6-vanilla-x86_64-smp.config} |  0
 ...config => kernel-2.6.22-2.6-vanilla-x86_64.config} |  0
 lustre/kernel_patches/targets/2.6-vanilla.target.in   | 19 ++++++++++++++-----
 5 files changed, 14 insertions(+), 5 deletions(-)
 rename lustre/kernel_patches/kernel_configs/{kernel-2.6.22-2.6-sles10-i686-bigsmp.config => kernel-2.6.22-2.6-vanilla-i686-bigsmp.config} (100%)
 rename lustre/kernel_patches/kernel_configs/{kernel-2.6.22-2.6-sles10-i686.config => kernel-2.6.22-2.6-vanilla-i686.config} (100%)
 rename lustre/kernel_patches/kernel_configs/{kernel-2.6.22-2.6-sles10-x86_64-smp.config => kernel-2.6.22-2.6-vanilla-x86_64-smp.config} (100%)
 rename lustre/kernel_patches/kernel_configs/{kernel-2.6.22-2.6-sles10-x86_64.config => kernel-2.6.22-2.6-vanilla-x86_64.config} (100%)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-sles10-i686-bigsmp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-vanilla-i686-bigsmp.config
similarity index 100%
rename from lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-sles10-i686-bigsmp.config
rename to lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-vanilla-i686-bigsmp.config
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-sles10-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-vanilla-i686.config
similarity index 100%
rename from lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-sles10-i686.config
rename to lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-vanilla-i686.config
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-sles10-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-vanilla-x86_64-smp.config
similarity index 100%
rename from lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-sles10-x86_64-smp.config
rename to lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-vanilla-x86_64-smp.config
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-sles10-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-vanilla-x86_64.config
similarity index 100%
rename from lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-sles10-x86_64.config
rename to lustre/kernel_patches/kernel_configs/kernel-2.6.22-2.6-vanilla-x86_64.config
diff --git a/lustre/kernel_patches/targets/2.6-vanilla.target.in b/lustre/kernel_patches/targets/2.6-vanilla.target.in
index dd7a0c2..49dbe0f 100644
--- a/lustre/kernel_patches/targets/2.6-vanilla.target.in
+++ b/lustre/kernel_patches/targets/2.6-vanilla.target.in
@@ -1,8 +1,16 @@
-lnxmaj="2.6.18"
-lnxrel="8"
+lnxmaj="2.6.22"
+lnxrel="14"
+
+# this is the delimeter that goes between $lnxmaj and $lnxrel
+# defaults to "-"
+EXTRA_VERSION_DELIMITER="."
+
+# this is the delimeter that goes before the "smp" at the end of the version
+# defaults to empty
+TARGET_DELIMITER="-"
 
 KERNEL=linux-$lnxmaj.$lnxrel.tar.bz2
-SERIES=2.6.18-vanilla.series
+SERIES=2.6.22-vanilla.series
 VERSION=$lnxmaj
 EXTRA_VERSION="${lnxrel}_lustre.@VERSION@"
 LUSTRE_VERSION=@VERSION@
@@ -16,8 +24,9 @@ BASE_ARCHS="i686 x86_64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""
 JENSEN_ARCHS=""
-SMP_ARCHS="i686 x86_64"
-BIGSMP_ARCHS=""
+SMP_ARCHS="x86_64"
+BIGSMP_ARCHS="i686"
+PSERIES64_ARCHS=""
 UP_ARCHS=""
 SRC_ARCHS=""
 
-- 
1.8.3.1