b=2516

merge up to RC_1_0_3_5:

work around lameness in mkkerneldoth

lustre/kernel_patches/targets/rh-2.4.target

-KERNEL=linux-2.4.20-20.9.tar.gz
+KERNEL=linux-2.4.20-28.9.tar.gz
 SERIES=rh-2.4.20
 VERSION=2.4.20
-EXTRA_VERSION=20.9
+EXTRA_VERSION=28.9_lustre
 
-BASE_ARCHS="i386"
+BASE_ARCHS="i586"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""
 JENSEN_ARCHS=""
-SMP_ARCHS="i686"
+SMP_ARCHS="i586"
 UP_ARCHS=""
+SRC_ARCHS="i586"

lustre/scripts/lustre-kernel-2.4.spec.in

@@ -47,6 +47,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 %define buildjensen 0
 %define buildsmp 0
 %define buildup 0
+%define buildsrc 0
 
 %ifarch @BASE_ARCHS@
 %define buildbase 1
@@ -338,6 +339,22 @@ BuildKernel()
 	-- @CONFIGURE_FLAGS@
 }
 
+BuildLustre()
+{
+  target_config=${1:+--target-config $1}
+  sh -x ./scripts/lmake \
+	--build-lustre \
+	--install-lustre \
+	--target @LUSTRE_TARGET@ \
+	--target-arch %{_target_cpu} \
+	${target_config} \
+	--extraversion %{kextraver} \
+	--kerneldir $RPM_SOURCE_DIR \
+	-j $RPM_BUILD_NCPUS \
+	--destdir $RPM_BUILD_ROOT \
+	-- @CONFIGURE_FLAGS@
+}
+
 SaveHeaders()
 {
   sh -x ./scripts/lmake \
@@ -366,8 +383,10 @@ BuildKernel smp
 %endif
 
 # we want this one last, so that it is the one populating /usr/bin
-%if %{buildup} || %{buildbase}
+%if %{buildup} && %{buildbase}
 BuildKernel
+%elseif %{buildbase}
+BuildLustre
 %endif
 
 %if %{buildbase}