b=17922

i=sheng.yang
i=brian

use real vanilla kernel config/series

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 22b55d7..49dbe0f 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-vanilla.target.in
+++ b/lustre/kernel_patches/targets/2.6-vanilla.target.in
@@ -1,6 +1,14 @@
 lnxmaj="2.6.22"
 lnxrel="14"
 
 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.22-vanilla.series
 VERSION=$lnxmaj
 KERNEL=linux-$lnxmaj.$lnxrel.tar.bz2
 SERIES=2.6.22-vanilla.series
 VERSION=$lnxmaj


@@ -16,8 +24,9 @@ BASE_ARCHS="i686 x86_64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""
 JENSEN_ARCHS=""
 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=""
 
 UP_ARCHS=""
 SRC_ARCHS=""