X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flmake;h=cb177a287dfbbecdf3c8750c60db59545488827a;hb=cfaf31a01d1e3023611130ec1f8ece073f0092b9;hp=854151058594cbb368a0c3f8ddec2631f72194ea;hpb=bbf352545f275c194f195f1a702e931412fbbe76;p=fs%2Flustre-release.git

diff --git a/build/lmake b/build/lmake
index 8541510..cb177a2 100755
--- a/build/lmake
+++ b/build/lmake
@@ -341,6 +341,30 @@ set_make()
     MAKE_J="$MAKE -j $JOBS"
 }
 
+timed_run() {
+    SLEEP_TIME=$1
+    shift
+
+    set -o monitor
+
+    #bash -c "$@" &
+    ("$@") &
+    child_pid=$!
+    
+    (sleep $SLEEP_TIME
+    kill -TERM -$child_pid 2>/dev/null
+    sleep 5
+    kill -KILL -$child_pid 2>/dev/null
+    echo "$1 was killed due to timeout") &
+    dog_pid=$!
+
+    wait $child_pid
+    # status will be set to 143 if the process had to be killed due to timeout
+    status=${PIPESTATUS[0]}
+    kill -KILL -$dog_pid
+    return $status
+}
+
 depend_kernel()
 {
     (( $DEPEND_KERNEL )) || return 0
@@ -354,25 +378,48 @@ depend_kernel()
     $MAKE "$MAKE_CC" mrproper || fatal 1 "Error running make mrproper"
     rm -f rpm-release
     cp "$CONFIG_FILE" .config
-    for oc in oldconfig_nonint silentoldconfig oldconfig ; do
-	if grep -q "^$oc:" Makefile ; then
-	    $MAKE "$MAKE_CC" $oc || fatal 1 "Error running make oldconfig ($oc)"
-	    break
-	fi
-    done
+    # use the expect script to "make oldconfig" and answer the questions for
+    # new items conservatively.  QA will get notified on anything newly added
+    # for them to review and adjust accordingly.
+    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 \$?")
+    $TOPDIR/build/update_oldconfig $logfile
+    local RC=${PIPESTATUS[0]}
+    if [ $RC -eq 143 ]; then
+        fatal 1 "update_oldconfig timed out"
+    elif [ $RC -ne 0 ]; then
+	# dump the log
+        cat $logfile
+        rm -f $logfile
+	if [ -f update_oldconfig.strace ]; then
+	    cat update_oldconfig.strace
+	    rm -f update_oldconfig.strace
+        fi
+        fatal 1 "update_oldconfig failed: $RC. See log above."
+    fi
+    rm -f $logfile
     # now notify if resulting .config is different than $CONFIG_FILE
-    if ! cmp "$CONFIG_FILE" .config; then
+    local tmpfile=$(mktemp /tmp/XXXXXX)
+    diff -I '^#.*' -u "$CONFIG_FILE" .config >$tmpfile
+    if [ -s $tmpfile ]; then
         { cat <<EOF
-The result of a make $oc on file $CONFIG_FILE resulted in a difference when
-compared to $CONFIG_FILE in the following way:
+To: qa@lists.clusterfs.com
+Subject: kernel_config change 
+
+The result of a make oldconfig on file $CONFIG_FILE resulted in a
+difference when compared to .config in the following way:
 
 EOF
-        diff -ur "$CONFIG_FILE" .config
-        echo "Please consider updating $CONFIG_FILE."
-	echo -e "\nThe entire new .config file:\n"
-        cat .config
-        } | mail -s "kernel_config change" qa@lists.clusterfs.com
+        cat $tmpfile
+        echo -e "\n\nPlease consider updating $CONFIG_FILE."
+	# not sure these are entirely useful.  the above and "patch" are good
+	#echo -e "\nThe entire new .config file:\n"
+        #cat .config
+        } | sendmail -fqa@clusterfs.com -t
     fi
+    rm -f $tmpfile
     case "$VERSION" in
 	2.6*)
             $MAKE "$MAKE_CC" include/asm
@@ -534,7 +581,7 @@ build_kms()
     mkdir -p "${TOPDIR}/modules-${FULL_VERSION}"
     for dir in /usr/src/kernel-modules/* ; do
 	# we are replacing lustre-lite, so don't include it
-	if [ ${dir##*/} != "lustre-lite" -a -e $dir/Makefile ]; then
+	if [ "${dir##*/}" != "lustre-lite" -a -e $dir/Makefile ]; then
 	    build_dir="${TOPDIR}/modules-${FULL_VERSION}/${dir##*/}"
 	    cp -a $dir $build_dir
 	    # these modules are terrible, and don't all build