From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Thu, 27 Oct 2016 06:20:41 +0200 Subject: [U-Boot] [PATCH 1/6] travis-ci: Use = not : when writing ~/.buildman In-Reply-To: <20161026170536.2367-1-swarren@wwwdotorg.org> References: <20161026170536.2367-1-swarren@wwwdotorg.org> Message-ID: <58118099.3090001@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Stephen, Am 26.10.2016 um 19:05 schrieb Stephen Warren: > From: Stephen Warren > > 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 > --- > .travis.yml | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Thanks! Reviewed-by: Heiko Schocher bye, Heiko > > diff --git a/.travis.yml b/.travis.yml > index 00be5ff20396..f91e1bc271fe 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: > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany