lustre-kernel-2.4.spec uses '_tmppath' instead of '_tmpdir' in its Builtroot variable.

[fs/lustre-release.git] / build / lmake

diff --git a/build/lmake b/build/lmake
index 612abb8..1afbb1a 100755 (executable)
--- a/build/lmake
+++ b/build/lmake
@@ -10,6 +10,7 @@ TARGET_ARCH=
 TARGET_CONFIG=
 JOBS=1
 CONFIGURE_FLAGS=
+TMPDIR=${TMPDIR:-"/var/tmp"}
 
 # commands to run
 BUILD_LUSTRE=0
@@ -393,7 +394,9 @@ depend_kernel()
         local logfile=$(mktemp /tmp/XXXXXX)
         #timed_run 300 $TOPDIR/build/update_oldconfig $logfile
         #local RC=${PIPESTATUS[0]}
-        local RC=$(strace -f -o update_oldconfig.strace bash -c "$TOPDIR/build/update_oldconfig $logfile; echo \$?")
+        #local RC=$(strace -f -o update_oldconfig.strace bash -c "$TOPDIR/build/update_oldconfig $logfile; echo \$?")
+        $TOPDIR/build/update_oldconfig $logfile
+        local RC=${PIPESTATUS[0]}
         #$TOPDIR/build/update_oldconfig $logfile
         #local RC=${PIPESTATUS[0]}
         if [ $RC -eq 143 ]; then
@@ -490,6 +493,7 @@ build_lustre()
        < build/lustre.spec.in \
        > build/lustre.spec
     $RPMBUILD --target ${TARGET_ARCH} -bb build/lustre.spec \
+        --define "_tmppath $TMPDIR" \
        --define "_topdir $(lbuild_topdir)" || \
        fatal 1 "Error building Lustre rpms."
     # $MAKE_J "$MAKE_CC" || fatal 1 "Error building Lustre."