- for oc in oldconfig_nonint silentoldconfig oldconfig ; do
- if grep -q "$oc" Makefile ; then
- $MAKE "$MAKE_CC" $oc || fatal 1 "Error running make oldconfig"
- 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.
+ timed_run 300 $TOPDIR/build/update_oldconfig
+ if [ $? -eq 143 ]; then
+ fatal 1 "update_oldconfig timed out"
+ fi
+ # 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
+
+The result of a make oldconfig on file $CONFIG_FILE resulted in a
+difference when compared to .config in the following way:
+
+EOF
+ 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