Merge commit '6fcb1ac2ddc2'

Use .../mails/ as dir for sent emails

diff --git a/build_msg b/build_msg
index 00268c152ecfa51dda948c0568291e2d9762db0f..f56db1033d903fae7bdb01cc95d09d5a0939d7b2 100755 (executable)
--- a/build_msg
+++ b/build_msg
@@ -3,7 +3,7 @@
 subject="build failure after merge of the BRANCH tree"
 
 $(dirname $0)/message_helper "$@" "$subject" <<EOF
-After merging the BRANCH tree, today's linux-next build ()
+After merging the BRANCH tree, today's linux-next build (KCONFIG_NAME)
 failed like this:
 EOF
 

diff --git a/do_build b/do_build
index 89a3d7665b38f9ecfc0fc82d610d6365cabdd90c..6909065762d81ffeb5c75702327fb5043936170d 100755 (executable)
--- a/do_build
+++ b/do_build
@@ -6,87 +6,100 @@ set -e
 
 ###ssh "$build_host" /bin/sh -e <<-EOF
 ssh root@"$build_host" unshare -n su $(id -u -n) <<-EOF
-       set -e
 
        echo Building on \$(hostname)
 
        echo \$PATH | grep -q "\$HOME/bin" || export PATH="\$HOME/bin:\$PATH"
        export LANG=C
 
-       cd "$build_dir"
+       cd "$build_dir" || exit 1
 
        export CCACHE_DIR="${build_dir%/*}/.ccache"
        export TMPDIR="${build_dir%/*}/tmp"
 
-       git reset --hard next
-       touch .scmversion
+       git reset --hard next || exit 1
+       touch .scmversion || exit 1
 
        echo Building: x86_64 allmodconfig
        d=../x86_64_allmodconfig
-       [ -d \$d ] || mkdir \$d
+       [ -d \$d ] || mkdir \$d || exit 1
        log_x86=\$d.log
        e=\$d.except
-       echo CONFIG_BUILD_DOCSRC=n >\$e
-       {
-               KCONFIG_ALLCONFIG=\$e cross -n -N -a x86_64 -c $gcc_version O=\$d allyesconfig
-               /usr/bin/time cross -n -N -a x86_64 -c $gcc_version O=\$d -j$j_factor -s
-       } > \$log_x86 2>&1 &
+       echo CONFIG_BUILD_DOCSRC=n >\$e || exit 1
+       KCONFIG_ALLCONFIG=\$e cross -n -N -a x86_64 -c $gcc_version O=\$d allyesconfig || exit 1
+       echo "Forking x86 build ..."
+       /usr/bin/time cross -n -N -a x86_64 -c $gcc_version O=\$d -j$j_factor -s > \$log_x86 2>&1 &
 
        echo Building: powerpc ppc64_defconfig
        d=../powerpc_ppc64_defconfig
-       [ -d \$d ] || mkdir \$d
+       [ -d \$d ] || mkdir \$d || exit 1
        log_ppc=\$d.log
-       {
-               cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d ppc64_defconfig
-               /usr/bin/time cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d -j$j_factor -s
-       } > \$log_ppc 2>&1 &
+       cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d ppc64_defconfig || exit 1
+       echo "Forking powerpc build ..."
+       /usr/bin/time cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d -j$j_factor -s > \$log_ppc 2>&1 &
 
        echo Building: arm multi_v7_defconfig
        d=../arm_multi_v7_defconfig
-       [ -d \$d ] || mkdir \$d
+       [ -d \$d ] || mkdir \$d || exit 1
        log_arm=\$d.log
-       {
-               cross -n -N -a arm -c $gcc_version O=\$d multi_v7_defconfig
-               /usr/bin/time cross -n -N -a arm -c $gcc_version O=\$d -j$j_factor -s
-       } > \$log_arm 2>&1 &
+       cross -n -N -a arm -c $gcc_version O=\$d multi_v7_defconfig || exit 1
+       echo "Forking arm build ..."
+       /usr/bin/time cross -n -N -a arm -c $gcc_version O=\$d -j$j_factor -s > \$log_arm 2>&1 &
 
        wait %3
        rc=\$?
 
-       cat \$log_arm
        if [ \$rc -ne 0 ]; then
-               echo "ERROR: ARM build failed"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: ARM build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_arm
                kill %1
                kill %2
+               killall make
                rm .scmversion
                exit 1
        else
-               echo "ARM build OK"
+               echo "=================================================="
+               echo " ARM build OK - log follows"
+               echo "=================================================="
+               cat \$log_arm
        fi
 
        wait %2
        rc=\$?
 
-       cat \$log_ppc
        if [ \$rc -ne 0 ]; then
-               echo "ERROR: powerpc build failed"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: powerpc build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_ppc
                kill %1
+               killall make
                rm .scmversion
                exit 1
        else
-               echo "powerpc build OK"
+               echo "=================================================="
+               echo " powerpc build OK - log follows"
+               echo "=================================================="
+               cat \$log_ppc
        fi
 
        wait %1
        rc=\$?
 
-       cat \$log_x86
        if [ \$rc -ne 0 ]; then
-               echo "ERROR: x86 build failed"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               echo "ERROR: x86 build failed - log follows"
+               echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+               cat \$log_x86
                rm .scmversion
                exit 1
        else
-               echo "x86 build OK"
+               echo "=================================================="
+               echo " x86 build OK - log follows"
+               echo "=================================================="
+               cat \$log_x86
        fi
 
        rm .scmversion

diff --git a/do_merge b/do_merge
index 0ad0d440da5c5d4a3219cd979ab9b30b006361fe..0dfa7d52c7947611f7f29af446dc7e9408ac3cdb 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -134,6 +134,10 @@ for h in $heads; do
                        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                                notify-send -t 0 -u critical "linux-next new conflict found merging $tree!"
                                pushover "linux-next new conflict found merging $tree!"
+                               if [ -f "../merge-fixes/$tree" ]; then
+                                       echo "Merge fixes exist for this tree:"
+                                       cat "../merge-fixes/$tree"
+                               fi
                                bash -i || exit
                        }
 #                      [ "$(git status --porcelain)" ] && {

diff --git a/make_tree_file b/make_tree_file
index 9cc6882365a87c8d9623d7fc52cb968eaec40cdc..ecc6cbeff2b9347ebde6bc0c81339b518ebbb66b 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -13,7 +13,7 @@ h=$(date '+%k')
 ssh $build_host /usr/local/bin/set-kisskb-jfactor 48
 
 eval $(gpg-agent --daemon --enable-ssh-support)
-ssh-add $ssh_key_file
+ssh-add $ssh_key_file || exit 1
 
 if ! ssh git@gitolite.kernel.org 2fa isval; then
        read -r -p "Yubikey token: " tok

diff --git a/send_email b/send_email
index 470858af53044b5aace67cd8b6ca9291b469a04c..37e5c349d39eb475f24f84be031ad46f5e3584fa 100755 (executable)
--- a/send_email
+++ b/send_email
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TARGET=$HOME/linux-next-$$.email
+TARGET="$(dirname $0)/../mails"/$(date +"%Y-%m-%d+%s").email
 
 to="$1"
 cc="$2"