-#!/bin/sh
+#!/bin/bash
tree=
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" ] &&
+if [ "$build_host" ]; then
cmd="ssh root@$build_host unshare -n su $(id -u -n)"
+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
+/^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
+/^Warning: Kernel ABI header at /d
+/^[[:space:]]+PERF_VERSION = /d
+s/^([[:xdigit:]]+)([[:space:]]+R_PPC64_REL32[[:space:]].*)$/XXX\2/'
$cmd <<-EOF
[ -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
}
show_log() {
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
}
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 -j"$j_factor" -O -s > \$log_x86 2>&1 &
x86_64_pid=\$!
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
+ make ARCH=powerpc 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 &
+ /usr/bin/time make ARCH=powerpc O=\$d -j"$j_factor" -O -s > \$log_ppc 2>&1 &
ppc64_pid=\$!
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
+ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- 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 &
+ /usr/bin/time make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=\$d -j"$j_factor" -O -s > \$log_arm 2>&1 &
arm_pid=\$!
echo Building: perf
echo "ERROR: perf build failed - log follows"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
cat \$log_perf
- kill \$x86_64_pid
- kill \$ppc64_pid
- kill \$arm_pid
+ kill \$x86_64_pid || true
+ kill \$ppc64_pid || true
+ kill \$arm_pid || true
killall make
rm .scmversion
exit 1
echo "ERROR: arm multi_v7_defconfig build failed - log follows"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
cat \$log_arm
- kill \$x86_64_pid
- kill \$ppd64_pid
+ kill \$x86_64_pid || true
+ kill \$ppc64_pid || true
killall make
rm .scmversion
exit 1
echo "ERROR: powerpc ppc64_defconfig build failed - log follows"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
cat \$log_ppc
- kill \$x86_64_pid
+ kill \$x86_64_pid || true
killall make
rm .scmversion
exit 1