X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=do_build;h=a898bbaff6ec0e01e90928da8d0c78e0e21425cb;hb=HEAD;hp=970ce241f44425493985977356be02c1970c1c1e;hpb=ca00d9f9f2fc913c8d70fe0f8748d20c4c874a60;p=next-scripts diff --git a/do_build b/do_build index 970ce24..0815989 100755 --- a/do_build +++ b/do_build @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash tree= if [ "$1" ]; then @@ -6,30 +6,44 @@ if [ "$1" ]; then shift fi -tools_dir=$(cd $(dirname "$0"); pwd) -. "$tools_dir/common.sh" +# shellcheck source=common.sh +. "$(dirname "$0")/common.sh" set -e bparent=$(dirname "$build_dir") -line="$(tail -n 1 $SHA1_FILE)" +line=$(tail -n 1 "$SHA1_FILE") # strip everything after the first tab character stree=${line%% *} if [ "$tree" ]; then - [ "$tree" = "$stree" ] || { - echo "That is not the last tree merged ($tree v $stree)" 1>&2 + if [ "$tree" != "$stree" ]; then + printf 'That is not the last tree merged (%s v %s)\n' "$tree" "$stree" 1>&2 exit 1 - } + fi else tree="$stree" fi obdir="$bparent/old/$tree" cmd="/bin/sh" -[ "$build_host" ] && - cmd="ssh root@$build_host unshare -n su $(id -u -n)" +if [ "$build_host" ]; then + cmd="ssh -T $build_host" +fi + +log_regex='/^[[:space:]]+$/d +/^[.[:digit:]]+user [.[:digit:]]+system [:.[:digit:]]+elapsed [[:digit:]]+%CPU \([[:digit:]]+avgtext\+[[:digit:]]+avgdata [[:digit:]]+maxresident\)k$/d +/^[[:digit:]]+inputs\+[[:digit:]]+outputs \([[:digit:]]+major\+[[:digit:]]+minor\)pagefaults [[:digit:]]+swaps$/d +/^Setup is [[:digit:]]+ bytes \(padded to [[:digit:]]+ bytes\)\.$/d +/^System is [[:digit:]]+ kB$/d +/^CRC [[:xdigit:]]+$/d +/^Kernel: arch\/x86\/boot\/bzImage is ready \(#[[:digit:]]+\)$/d +s/^(WARNING: (modpost: )?(drivers\/built-in|vmlinux)\.o\(\.[^+]*\+0x)[[:xdigit:]]+(\): Section mismatch in reference from .*)$/\1XXXX\4/ +/^Warning: Kernel ABI header at /d +/^[[:space:]]+PERF_VERSION = /d +s/^(Parsed description of) [[:digit:]]+ (helper function)/\1 X \2/ +s/^[[:xdigit:]]+([[:space:]]+R_PPC64_(ADDR64|REL32)[[:space:]].*)$/XXX\1/' $cmd <<-EOF @@ -46,20 +60,31 @@ $cmd <<-EOF git reset --hard next || exit 1 touch .scmversion || exit 1 + g=../global.except + if [ -r \$g ]; then + KCONFIG_ALLCONFIG=\$g + export KCONFIG_ALLCONFIG + fi + [ -d "$obdir" ] || mkdir -p "$obdir" || exit 1 sanitise_log() { - sed -r ' -/^[[:space:]]+$/d -/^[.[:digit:]]+user [.[:digit:]]+system [:.[:digit:]]+elapsed [[:digit:]]+%CPU \([[:digit:]]+avgtext\+[[:digit:]]+avgdata [[:digit:]]+maxresident\)k$/d -/^[[:digit:]]+inputs\+[[:digit:]]+outputs \([[:digit:]]+major\+[[:digit:]]+minor\)pagefaults [[:digit:]]+swaps$/d -/^Setup is [[:digit:]]+ bytes \(padded to [[:digit:]]+ bytes\)\.$/d -/^System is [[:digit:]]+ kB$/d -/^CRC [[:xdigit:]]+$/d -/^Kernel: arch\/x86\/boot\/bzImage is ready \(#[[:digit:]]+\)$/d -/^WARNING: vmlinux\.o\(\.text\+0x[[:xdigit:]]+\): Section mismatch in reference from /d -/^WARNING: drivers\/built-in\.o\(\.text\+0x[[:xdigit:]]+\): Section mismatch in reference from /d -' | grep -vxFf $bparent/log-ignore + sed -E -e '$log_regex' | grep -vxFf $bparent/log-ignore + } + + do_fail() + { + sep='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' + echo "\$sep" + echo "ERROR: \$1 build failed - log follows" + echo "\$sep" + cat "\$2" + if [ -n "\$3" ]; then + kill "\$3" || true + fi + killall make + rm .scmversion + exit 1 } show_log() { @@ -74,17 +99,27 @@ $cmd <<-EOF echo "\$sep" cat \$log b=\$(basename \$log) + olen=0 if [ -f $obdir/\$b ]; then olen=\$(sanitise_log <$obdir/\$b | wc -l) - len=\$(sanitise_log <\$log | wc -l) - if [ \$olen -lt \$len ]; then - echo "\$sep" - echo " log \$b increased number of lines" - echo "\$sep" - pushover "linux-next log got bigger" + fi + len=\$(sanitise_log <\$log | wc -l) + if [ \$len -gt \$olen ]; then + echo "\$sep" + echo " log \$b increased number of lines" + echo "\$sep" + linux-next-notify "\$arch \$conf log got bigger" + if [ -f $obdir/\$b ]; then diff -u $obdir/\$b \$log 2>&1 | less + else + diff -u /dev/null \$log 2>&1 | less fi fi + if [ \$len -gt 0 ]; then + (sanitise_log <\$log; cat $bparent/log-ignore ) | + sort -u >$bparent/log-ignore.tmp + mv $bparent/log-ignore.tmp $bparent/log-ignore + fi mv \$log $obdir/\$b } @@ -92,101 +127,51 @@ $cmd <<-EOF d="$bparent/x86_64_allmodconfig" [ -d \$d ] || mkdir \$d || exit 1 log_x86=\$d.log - cross -n -N -a x86_64 -c "$gcc_version" O=\$d -s allmodconfig || exit 1 + make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=\$d -s allmodconfig || exit 1 echo "Forking x86 build ..." - /usr/bin/time cross -n -N -a x86_64 -c "$gcc_version" O=\$d -j"$j_factor" -O -s > \$log_x86 2>&1 & + /usr/bin/time make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=\$d -j200 -O -s > \$log_x86 2>&1 & x86_64_pid=\$! + echo Building: perf + d="$bparent/perf" + [ -d \$d ] || mkdir \$d || exit 1 + log_perf=\$d.log + + if ! /usr/bin/time make -C tools/perf -f Makefile.perf -s -O -j100 O=\$d NO_BPF_SKEL=1 > \$log_perf 2>&1; then + do_fail perf "\$log_perf" "\$x86_64_pid" + fi + + show_log native perf \$log_perf + echo Building: powerpc ppc64_defconfig d="$bparent/powerpc_ppc64_defconfig" [ -d \$d ] || mkdir \$d || exit 1 log_ppc=\$d.log - cross -n -N -a powerpc64 -k powerpc -c "$gcc_ppc_version" O=\$d -s ppc64_defconfig || exit 1 - echo "Forking powerpc build ..." - /usr/bin/time cross -n -N -a powerpc64 -k powerpc -c "$gcc_ppc_version" O=\$d -j"$j_factor" -O -s > \$log_ppc 2>&1 & - ppc64_pid=\$! + make ARCH=powerpc O=\$d -s ppc64_defconfig || exit 1 + + if ! /usr/bin/time make ARCH=powerpc O=\$d -j100 -O -s > \$log_ppc 2>&1; then + do_fail "powerpc ppc64_defconfig" "\$log_ppc" "\$x86_64_pid" + fi + + show_log powerpc ppc64_defconfig \$log_ppc echo Building: arm multi_v7_defconfig d="$bparent/arm_multi_v7_defconfig" [ -d \$d ] || mkdir \$d || exit 1 log_arm=\$d.log - cross -n -N -a arm -c "$gcc_version" O=\$d -s 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" -O -s > \$log_arm 2>&1 & - arm_pid=\$! + make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -s multi_v7_defconfig || exit 1 - echo Building: perf - d="$bparent/perf" - [ -d \$d ] || mkdir \$d || exit 1 - log_perf=\$d.log - echo "Forking perf build ..." - /usr/bin/time make -C tools/perf -f Makefile.perf -s -O -j"$j_factor" O=\$d > \$log_perf 2>&1 & - perf_pid=\$! - - wait \$perf_pid - rc=\$? - - if [ \$rc -ne 0 ]; then - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - echo "ERROR: perf build failed - log follows" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - cat \$log_perf - kill \$x86_64_pid - kill \$ppc64_pid - kill \$arm_pid - killall make - rm .scmversion - exit 1 - else - show_log native perf \$log_perf - fi - - wait \$arm_pid - rc=\$? - - if [ \$rc -ne 0 ]; then - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - echo "ERROR: arm multi_v7_defconfig build failed - log follows" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - cat \$log_arm - kill \$x86_64_pid - kill \$ppd64_pid - killall make - rm .scmversion - exit 1 - else - show_log arm multi_v7_defconfig \$log_arm + if ! /usr/bin/time make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -j100 -O -s > \$log_arm 2>&1; then + do_fail 'arm multi_v7_defconfig' "\$log_arm" "\$x86_64_pid" fi - wait \$ppc64_pid - rc=\$? + show_log arm multi_v7_defconfig \$log_arm - if [ \$rc -ne 0 ]; then - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - echo "ERROR: powerpc ppc64_defconfig build failed - log follows" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - cat \$log_ppc - kill \$x86_64_pid - killall make - rm .scmversion - exit 1 - else - show_log powerpc ppc64_defconfig \$log_ppc + if ! wait \$x86_64_pid; then + do_fail "x86_64 allmodconfig" "\$log_x86" fi - wait \$x86_64_pid - rc=\$? - - if [ \$rc -ne 0 ]; then - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - echo "ERROR: x86_64 allmodconfig build failed - log follows" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - cat \$log_x86 - rm .scmversion - exit 1 - else - show_log x86_64 allmodconfig \$log_x86 - fi + show_log x86_64 allmodconfig \$log_x86 rm .scmversion EOF