]> git.sur5r.net Git - u-boot/commitdiff
travis-ci: Use = not : when writing ~/.buildman
authorStephen Warren <swarren@nvidia.com>
Wed, 26 Oct 2016 17:05:31 +0000 (11:05 -0600)
committerTom Rini <trini@konsulko.com>
Sat, 29 Oct 2016 02:10:42 +0000 (22:10 -0400)
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 <swarren@nvidia.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
.travis.yml

index 00be5ff203961dead3ab6750830ff21876a97f71..f91e1bc271fe4f1702255954ce91cff6a334ff47 100644 (file)
@@ -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: