[U-Boot] [PATCH 5/8] travis-ci: Update toolchain and buildman usage

Tom Rini
2016-10-20T19:26:03Z

- Drop the 'cache' line, travis-ci says to not cache apt packages (and
does not).
- Get the Ubuntu provided toolchain for ARM and PowerPC.
- Add more toolchain options that buildman can fetch.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
.travis.yml | 59 +++++++++++++++--------------------------------------------
1 file changed, 15 insertions(+), 44 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d93efe02b0b1..8d1a90eb164b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,9 @@ addons:
- libsdl1.2-dev
- python
- python-virtualenv
-
-cache:
- - apt
+ - gcc-powerpc-linux-gnu
+ - gcc-arm-linux-gnueabihf
+ - iasl

install:
# install latest device tree compiler
@@ -29,17 +29,8 @@ install:
- make -j4 -C /tmp/dtc
# prepare buildman environment
- export BUILDMAN_ROOT="root:"
- - export BUILDMAN_PPC="ppc:"
- - export BUILDMAN_ARM="arm:"
- - export BUILDMAN_SANDBOX="sandbox:"
- - echo -e "[toolchain]\n${BUILDMAN_ROOT} /\n" > ~/.buildman
- - echo -e "${BUILDMAN_PPC} /opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/\n" >> ~/.buildman
- - echo -e "${BUILDMAN_ARM} /opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/\n" >> ~/.buildman
- - echo -e "${BUILDMAN_SANDBOX} /usr/bin/gcc\n" >> ~/.buildman
- - export BUILDMAN_ALIAS="x86:"
- - export BUILDMAN_ALIAS_ARM="arm:"
- - echo -e "\n\n[toolchain-alias]\n${BUILDMAN_ALIAS} i386\n" >> ~/.buildman
- - echo -e "${BUILDMAN_ALIAS_ARM} armv5te\n" >> ~/.buildman
+ - echo -e "[toolchain]\n${BUILDMAN_ROOT} /usr" > ~/.buildman
+ - echo -e "\n[toolchain-alias]\nblackfin = bfin\nsh = sh4\nopenrisc = or32" >> ~/.buildman
- cat ~/.buildman
- virtualenv /tmp/venv
- . /tmp/venv/bin/activate
@@ -55,14 +46,15 @@ env:
before_script:
# install toolchains based on TOOLCHAIN} variable
- if [[ "${TOOLCHAIN}" == *aarch64* ]]; then ./tools/buildman/buildman --fetch-arch aarch64 ; fi
- - if [[ "${TOOLCHAIN}" == *arm* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/armv5te/eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh ; fi
- - if [[ "${TOOLCHAIN}" == *arm* ]]; then sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y ; fi
- if [[ "${TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi
- - if [[ "${TOOLCHAIN}" == *i386* ]]; then ./tools/buildman/buildman sandbox --fetch-arch i386 ; fi
+ - if [[ "${TOOLCHAIN}" == *bfin* ]]; then ./tools/buildman/buildman --fetch-arch bfin ; fi
- if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi
+ - if [[ "${TOOLCHAIN}" == *microblaze* ]]; then ./tools/buildman/buildman --fetch-arch microblaze ; fi
- if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi
- - if [[ "${TOOLCHAIN}" == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi
- - if [[ "${TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi
+ - if [[ "${TOOLCHAIN}" == *or32* ]]; then ./tools/buildman/buildman --fetch-arch or32 ; fi
+ - if [[ "${TOOLCHAIN}" == *sh4* ]]; then ./tools/buildman/buildman --fetch-arch sh4 ; fi
+ - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then ./tools/buildman/buildman --fetch-arch x86_64 ; fi
+ - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then ./tools/buildman/buildman --fetch-arch xtensa ; fi

script:
# the execution sequence for each test
@@ -86,40 +78,33 @@ matrix:
# each env setting here is a dedicated build
- env:
- BUILDMAN="arm1136"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="arm1136"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="arm1176"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="arm720t"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="arm920t"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="atmel -x avr32"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="avr32"
TOOLCHAIN="avr32"
- env:
- BUILDMAN="davinci"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="denx"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="freescale -x powerpc,m68k,aarch64"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="sandbox x86"
- TOOLCHAIN="i386"
+ 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
- env:
- BUILDMAN="kirkwood"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="m68k"
TOOLCHAIN="m68k"
@@ -128,46 +113,32 @@ matrix:
TOOLCHAIN="mips"
- env:
- BUILDMAN="mpc512x"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="mpc5xx"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="mpc5xxx"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="mpc8260"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="mpc83xx"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="mpc85xx -x freescale"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="mpc85xx -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x sbc8548 -x bsc91*"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="t208xrdb t4qds t102*"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="p1_p2_rdb_pc p1010rdb"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="corenet_ds b4860qds sbc8548 bsc91*"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="mpc86xx"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="mpc8xx"
- TOOLCHAIN="ppc"
- env:
- BUILDMAN="siemens"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="ti"
- TOOLCHAIN="arm"
- env:
- BUILDMAN="aarch64"
TOOLCHAIN="aarch64"
--
1.9.1