- # 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.
- $TOPDIR/build/update_oldconfig
- # now notify if resulting .config is different than $CONFIG_FILE
- local tmpfile=$(mktemp /tmp/XXXXXX)
- diff -I '^#.*' -u "$CONFIG_FILE" .config >$tmpfile
- if [ -s $tmpfile ]; then
- { cat <<EOF
+ local UPDATE_OLDCONFIG=
+ for oc in oldconfig_nonint silentoldconfig oldconfig ; do
+ if grep -q "$oc" Makefile ; then
+ timed_run 300 $MAKE "$MAKE_CC" $oc || UPDATE_OLDCONFIG=1
+ break
+ fi
+ done
+
+ if [ "$UPDATE_OLDCONFIG" ] ; then
+ # 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]}
+ #$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
+ local tmpfile=$(mktemp /tmp/XXXXXX)
+ diff -I '^#.*' -u "$CONFIG_FILE" .config >$tmpfile
+ if [ -s $tmpfile ]; then
+ { cat <<EOF
+To: qa@lists.clusterfs.com
+Subject: kernel_config change
+