r=adilger

Ltest uses 'lbuild' to make rpms. When there're multiple ltestds do 'lbuild' at the same time, there's a good chance in a kernel or lustre building race if they build the rpms in a same directory. So we should use separate buildroot to avoid such issue. Also make changes to get 'make rpms' and 'make srpm' work smoothly with this change to lustre.spec.in.

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index bcdd810..7ed2572 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -66,7 +66,9 @@ build/lustre.spec: build/lustre.spec.in config.status
        ./config.status build/lustre.spec
 
 rpms: build/lustre.spec dist Makefile
-       rpmbuild -ta $(distdir).tar.gz
+       rpmbuild -ta $(distdir).tar.gz \
+                       --define "_tmppath $TMP"
 
 srpm: build/lustre.spec dist Makefile
-       rpmbuild -ts $(distdir).tar.gz
+       rpmbuild -ts $(distdir).tar.gz \
+                       --define "_tmppath $TMP"

diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index ae92a2b..33f6cf0 100644 (file)
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -10,7 +10,7 @@ License: GPL
 Group: Utilities/System
 Source: lustre-%{version}.tar.gz
 URL: http://clusterfs.com/
-BuildRoot: /var/tmp/lustre-%{version}-root
+BuildRoot: %{_tmppath}/lustre-%{version}-root
 Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap
 Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}