X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fscripts%2Flbuild;h=2c76308ace1830f386645f160255e49d01d7a8a5;hp=0e682c5674feb094bcd340e6e50e59749962a985;hb=1e4392a78495d4cacc63a1bce0df892b68b51235;hpb=50a30160e2f25863bdda49625ff1230bc23f6bba

diff --git a/lustre/scripts/lbuild b/lustre/scripts/lbuild
index 0e682c5..2c76308 100755
--- a/lustre/scripts/lbuild
+++ b/lustre/scripts/lbuild
@@ -308,6 +308,7 @@ prep_build()
 	-e "s/@JENSEN_ARCHS@/$BOOT_ARCHS/g" \
 	-e "s/@SMP_ARCHS@/$SMP_ARCHS/g" \
 	-e "s/@UP_ARCHS@/$UP_ARCHS/g" \
+	-e "s/@RHBUILD@/$RHBUILD/g" \
 	< $TOPDIR/lustre/scripts/lustre-kernel-2.4.spec.in \
 	> lustre-kernel-2.4.spec
     [ -d SRPMS ] || mkdir SRPMS
@@ -337,11 +338,11 @@ build()
     done
 
     rpmbuild $targets -bb lustre-kernel-2.4.spec \
-	--define "_topdir $TOPDIR" \
+	--define "_topdir $TOPDIR" || \
 	fatal 1 "Error building rpms for $arch."
 
     (( $DO_SRC )) && rpmbuild -bs lustre-kernel-2.4.spec \
-	--define "_topdir $TOPDIR" \
+	--define "_topdir $TOPDIR" || \
 	fatal 1 "Error building .src.rpm."
 }