b=6205

r=adilger

 - move the lustre kernel modules to their own package
 - lbuild now does 'make rpms' to build lustre modules, more or less
 - pass --with-linux to lbuild to build only lustre rpms against an
   existing kernel source tree
 - drop the lustre-ldap rpm

diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index a44bc0f..888ea3f 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel4.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in
@@ -7,6 +7,7 @@ VERSION=${lnxmaj}
 EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
 RHBUILD=1
 LINUX26=1
+LUSTRE_VERSION=@VERSION@
 
 BASE_ARCHS="i686 x86_64 ia64"
 BIGMEM_ARCHS=""

diff --git a/lustre/kernel_patches/targets/2.6-suse.target.in b/lustre/kernel_patches/targets/2.6-suse.target.in
index 4150cd1..a67deac 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-suse.target.in
+++ b/lustre/kernel_patches/targets/2.6-suse.target.in
@@ -6,6 +6,7 @@ KERNEL=linux-$lnxmaj-$lnxrel.tar.bz2
 SERIES=2.6-suse-lnxi.series
 VERSION=$lnxmaj
 EXTRA_VERSION="${lnxrel}_lustre.@VERSION@"
+LUSTRE_VERSION=@VERSION@
 RHBUILD=0
 LINUX26=1
 SUSEBUILD=1

diff --git a/lustre/kernel_patches/targets/2.6-vanilla.target.in b/lustre/kernel_patches/targets/2.6-vanilla.target.in
index 00c05df..84bd491 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-vanilla.target.in
+++ b/lustre/kernel_patches/targets/2.6-vanilla.target.in
@@ -4,6 +4,7 @@ KERNEL=linux-$lnxmaj.tar.gz
 SERIES=2.6-vanilla
 VERSION=$lnxmaj
 EXTRA_VERSION=lustre.@VERSION@
+LUSTRE_VERSION=@VERSION@
 RHBUILD=0
 
 BASE_ARCHS=""

diff --git a/lustre/kernel_patches/targets/hp_pnnl-2.4.target.in b/lustre/kernel_patches/targets/hp_pnnl-2.4.target.in
index 620e698..28c1be3 100644 (file)
--- a/lustre/kernel_patches/targets/hp_pnnl-2.4.target.in
+++ b/lustre/kernel_patches/targets/hp_pnnl-2.4.target.in
@@ -5,6 +5,7 @@ KERNEL=linux-$lnxmaj-$lnxrel.tar.gz
 SERIES=hp-pnnl-2.4.20
 VERSION=$lnxmaj
 EXTRA_VERSION=$lnxrel_lustre.@VERSION@
+LUSTRE_VERSION=@VERSION@
 RHBUILD=0
 
 BASE_ARCHS="ia64"

diff --git a/lustre/kernel_patches/targets/rh-2.4.target.in b/lustre/kernel_patches/targets/rh-2.4.target.in
index fa9140d..d27ed40 100644 (file)
--- a/lustre/kernel_patches/targets/rh-2.4.target.in
+++ b/lustre/kernel_patches/targets/rh-2.4.target.in
@@ -5,6 +5,7 @@ KERNEL=linux-${lnxmaj}-${lnxrel}.tar.gz
 SERIES=rh-2.4.20
 VERSION=$lnxmaj
 EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
+LUSTRE_VERSION=@VERSION@
 RHBUILD=1
 
 BASE_ARCHS="i686"

diff --git a/lustre/kernel_patches/targets/rhel-2.4.target.in b/lustre/kernel_patches/targets/rhel-2.4.target.in
index b8ad58a..b9b3a00 100644 (file)
--- a/lustre/kernel_patches/targets/rhel-2.4.target.in
+++ b/lustre/kernel_patches/targets/rhel-2.4.target.in
@@ -4,6 +4,7 @@ lnxrel="27.0.2.EL"
 KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=rhel-2.4.21
 VERSION=${lnxmaj}
+LUSTRE_VERSION=@VERSION@
 EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
 RHBUILD=1
 

diff --git a/lustre/kernel_patches/targets/sles-2.4.target.in b/lustre/kernel_patches/targets/sles-2.4.target.in
index b59fc56..784560a 100644 (file)
--- a/lustre/kernel_patches/targets/sles-2.4.target.in
+++ b/lustre/kernel_patches/targets/sles-2.4.target.in
@@ -5,6 +5,7 @@ KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=suse-2.4.21-jvn
 VERSION=${lnxmaj}
 EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
+LUSTRE_VERSION=@VERSION@
 RHBUILD=0
 LINUX26=0
 SUSEBUILD=1

diff --git a/lustre/kernel_patches/targets/suse-2.4.21-2.target.in b/lustre/kernel_patches/targets/suse-2.4.21-2.target.in
index 245c085..d00ca78 100644 (file)
--- a/lustre/kernel_patches/targets/suse-2.4.21-2.target.in
+++ b/lustre/kernel_patches/targets/suse-2.4.21-2.target.in
@@ -2,6 +2,7 @@ KERNEL=linux-2.4.21-x86_64.tar.gz
 SERIES=suse-2.4.21-2
 VERSION=2.4.21
 EXTRA_VERSION=lustre.@VERSION@
+LUSTRE_VERSION=@VERSION@
 RHBUILD=0
 
 BASE_ARCHS="x86_64"