From 43a68e49e13e94416a971a0e65499f1e87d3006d Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 26 Oct 2016 11:05:31 -0600 Subject: [PATCH] travis-ci: Use = not : when writing ~/.buildman Travis CI seems to be confused when there's a colon in an echo command, and this is currently worked around using a variable that contains the text we want to echo. Use = syntax instead so that we can remove the work-around; it's rather confusing until you find out what it's for. Signed-off-by: Stephen Warren Reviewed-by: Heiko Schocher --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00be5ff203..f91e1bc271 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,7 @@ install: - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname` - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` # prepare buildman environment - - export BUILDMAN_ROOT="root:" - - echo -e "[toolchain]\n${BUILDMAN_ROOT} /usr" > ~/.buildman + - echo -e "[toolchain]\nroot = /usr" > ~/.buildman - echo -e "\n[toolchain-alias]\nblackfin = bfin\nsh = sh4\nopenrisc = or32" >> ~/.buildman - cat ~/.buildman - virtualenv /tmp/venv @@ -105,8 +104,7 @@ matrix: - BUILDMAN="sandbox x86" TOOLCHAIN="x86_64" script: - - export BUILDMAN_X86="x86:"; - echo -e "\n[toolchain-prefix]\n${BUILDMAN_X86} ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman + - echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman - env: - BUILDMAN="kirkwood" - env: -- 2.25.1