aboutsummaryrefslogtreecommitdiff
path: root/u-boot-upstream.yaml
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2015-05-27 16:24:08 +0300
committerFathi Boudra <fathi.boudra@linaro.org>2015-05-27 13:27:04 +0000
commit1fa7b5e80d6a8707708e04887ba74ba2b5c5c94c (patch)
tree102cb035baa108f67670c84003179cd9b255d295 /u-boot-upstream.yaml
parent19e5b9ec1d6c51836a7cd869ec86f03786c71fe4 (diff)
u-boot-upstream: fix build failure triggered by kill_children()
FATAL: java.io.IOException: Unexpected termination of the channel caused by kill_children(). It doesn't kill only children processes but also the parents, including jenkins slave client. Change-Id: I47b11a39113adc36f2d19cd943bd554ed3f743f9 Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'u-boot-upstream.yaml')
-rw-r--r--u-boot-upstream.yaml8
1 files changed, 6 insertions, 2 deletions
diff --git a/u-boot-upstream.yaml b/u-boot-upstream.yaml
index da9d5f5906..6993dfcd21 100644
--- a/u-boot-upstream.yaml
+++ b/u-boot-upstream.yaml
@@ -44,12 +44,12 @@
cleanup_exit()
{
cd ${WORKSPACE}
- rm -rf build
+ rm -rf build out
git clean -fdx
}
sudo apt-get update
- sudo apt-get install -y python-pycurl libssl-dev
+ sudo apt-get install -y libssl-dev python-pycurl rsync
# Use pre-installed linaro toolchain
export PATH="${HOME}/srv/toolchain/arm-tc-15.02/bin:${HOME}/srv/toolchain/arm64-tc-15.02/bin:$PATH"
@@ -58,6 +58,10 @@
# Hack to avoid to clean the build as we want to publish build artifacts
sed -i "s|\t\t\${MAKE} -s clean||" MAKEALL
+ # FIXME kill_children doesn't kill only the children, it kills also the shell parents
+ # java -jar slave.jar -> /bin/bash /tmp/hudsonXXX.sh -> MAKEALL
+ sed -i "s|\t\tkill_children|\t\tkill -- -\$$|" MAKEALL
+
for CPU in armv7 armv8; do
[ "${CPU}" = "armv8" ] && export CROSS_COMPILE="aarch64-linux-gnu-"
export BUILD_DIR="${WORKSPACE}/build/${CPU}"