Commit cd402e01595d26890635208954481044e5c7ef01
1 parent
4899210c73
Exists in
v2017.01-smarct4x
and in
25 other branches
travis-ci: Update toolchain and buildman usage
- 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> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de>
Showing 1 changed file with 15 additions and 44 deletions Side-by-side Diff
.travis.yml
... | ... | @@ -19,27 +19,18 @@ |
19 | 19 | - libsdl1.2-dev |
20 | 20 | - python |
21 | 21 | - python-virtualenv |
22 | + - gcc-powerpc-linux-gnu | |
23 | + - gcc-arm-linux-gnueabihf | |
24 | + - iasl | |
22 | 25 | |
23 | -cache: | |
24 | - - apt | |
25 | - | |
26 | 26 | install: |
27 | 27 | # install latest device tree compiler |
28 | 28 | - git clone --depth=1 git://git.kernel.org/pub/scm/utils/dtc/dtc.git /tmp/dtc |
29 | 29 | - make -j4 -C /tmp/dtc |
30 | 30 | # prepare buildman environment |
31 | 31 | - export BUILDMAN_ROOT="root:" |
32 | - - export BUILDMAN_PPC="ppc:" | |
33 | - - export BUILDMAN_ARM="arm:" | |
34 | - - export BUILDMAN_SANDBOX="sandbox:" | |
35 | - - echo -e "[toolchain]\n${BUILDMAN_ROOT} /\n" > ~/.buildman | |
36 | - - echo -e "${BUILDMAN_PPC} /opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/\n" >> ~/.buildman | |
37 | - - echo -e "${BUILDMAN_ARM} /opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/\n" >> ~/.buildman | |
38 | - - echo -e "${BUILDMAN_SANDBOX} /usr/bin/gcc\n" >> ~/.buildman | |
39 | - - export BUILDMAN_ALIAS="x86:" | |
40 | - - export BUILDMAN_ALIAS_ARM="arm:" | |
41 | - - echo -e "\n\n[toolchain-alias]\n${BUILDMAN_ALIAS} i386\n" >> ~/.buildman | |
42 | - - echo -e "${BUILDMAN_ALIAS_ARM} armv5te\n" >> ~/.buildman | |
32 | + - echo -e "[toolchain]\n${BUILDMAN_ROOT} /usr" > ~/.buildman | |
33 | + - echo -e "\n[toolchain-alias]\nblackfin = bfin\nsh = sh4\nopenrisc = or32" >> ~/.buildman | |
43 | 34 | - cat ~/.buildman |
44 | 35 | - virtualenv /tmp/venv |
45 | 36 | - . /tmp/venv/bin/activate |
46 | 37 | |
47 | 38 | |
48 | 39 | |
... | ... | @@ -55,14 +46,15 @@ |
55 | 46 | before_script: |
56 | 47 | # install toolchains based on TOOLCHAIN} variable |
57 | 48 | - if [[ "${TOOLCHAIN}" == *aarch64* ]]; then ./tools/buildman/buildman --fetch-arch aarch64 ; fi |
58 | - - 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 | |
59 | - - if [[ "${TOOLCHAIN}" == *arm* ]]; then sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y ; fi | |
60 | 49 | - if [[ "${TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi |
61 | - - if [[ "${TOOLCHAIN}" == *i386* ]]; then ./tools/buildman/buildman sandbox --fetch-arch i386 ; fi | |
50 | + - if [[ "${TOOLCHAIN}" == *bfin* ]]; then ./tools/buildman/buildman --fetch-arch bfin ; fi | |
62 | 51 | - if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi |
52 | + - if [[ "${TOOLCHAIN}" == *microblaze* ]]; then ./tools/buildman/buildman --fetch-arch microblaze ; fi | |
63 | 53 | - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi |
64 | - - 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 | |
65 | - - if [[ "${TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi | |
54 | + - if [[ "${TOOLCHAIN}" == *or32* ]]; then ./tools/buildman/buildman --fetch-arch or32 ; fi | |
55 | + - if [[ "${TOOLCHAIN}" == *sh4* ]]; then ./tools/buildman/buildman --fetch-arch sh4 ; fi | |
56 | + - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then ./tools/buildman/buildman --fetch-arch x86_64 ; fi | |
57 | + - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then ./tools/buildman/buildman --fetch-arch xtensa ; fi | |
66 | 58 | |
67 | 59 | script: |
68 | 60 | # the execution sequence for each test |
69 | 61 | |
70 | 62 | |
71 | 63 | |
72 | 64 | |
73 | 65 | |
74 | 66 | |
75 | 67 | |
76 | 68 | |
77 | 69 | |
78 | 70 | |
... | ... | @@ -86,40 +78,33 @@ |
86 | 78 | # each env setting here is a dedicated build |
87 | 79 | - env: |
88 | 80 | - BUILDMAN="arm1136" |
89 | - TOOLCHAIN="arm" | |
90 | 81 | - env: |
91 | 82 | - BUILDMAN="arm1136" |
92 | - TOOLCHAIN="arm" | |
93 | 83 | - env: |
94 | 84 | - BUILDMAN="arm1176" |
95 | - TOOLCHAIN="arm" | |
96 | 85 | - env: |
97 | 86 | - BUILDMAN="arm720t" |
98 | - TOOLCHAIN="arm" | |
99 | 87 | - env: |
100 | 88 | - BUILDMAN="arm920t" |
101 | - TOOLCHAIN="arm" | |
102 | 89 | - env: |
103 | 90 | - BUILDMAN="atmel -x avr32" |
104 | - TOOLCHAIN="arm" | |
105 | 91 | - env: |
106 | 92 | - BUILDMAN="avr32" |
107 | 93 | TOOLCHAIN="avr32" |
108 | 94 | - env: |
109 | 95 | - BUILDMAN="davinci" |
110 | - TOOLCHAIN="arm" | |
111 | 96 | - env: |
112 | 97 | - BUILDMAN="denx" |
113 | - TOOLCHAIN="arm" | |
114 | 98 | - env: |
115 | 99 | - BUILDMAN="freescale -x powerpc,m68k,aarch64" |
116 | - TOOLCHAIN="arm" | |
117 | 100 | - env: |
118 | 101 | - BUILDMAN="sandbox x86" |
119 | - TOOLCHAIN="i386" | |
102 | + TOOLCHAIN="x86_64" | |
103 | + script: | |
104 | + - export BUILDMAN_X86="x86:"; | |
105 | + echo -e "\n[toolchain-prefix]\n${BUILDMAN_X86} ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman | |
120 | 106 | - env: |
121 | 107 | - BUILDMAN="kirkwood" |
122 | - TOOLCHAIN="arm" | |
123 | 108 | - env: |
124 | 109 | - BUILDMAN="m68k" |
125 | 110 | TOOLCHAIN="m68k" |
126 | 111 | |
127 | 112 | |
128 | 113 | |
129 | 114 | |
130 | 115 | |
131 | 116 | |
132 | 117 | |
133 | 118 | |
134 | 119 | |
135 | 120 | |
136 | 121 | |
137 | 122 | |
138 | 123 | |
... | ... | @@ -128,46 +113,32 @@ |
128 | 113 | TOOLCHAIN="mips" |
129 | 114 | - env: |
130 | 115 | - BUILDMAN="mpc512x" |
131 | - TOOLCHAIN="ppc" | |
132 | 116 | - env: |
133 | 117 | - BUILDMAN="mpc5xx" |
134 | - TOOLCHAIN="ppc" | |
135 | 118 | - env: |
136 | 119 | - BUILDMAN="mpc5xxx" |
137 | - TOOLCHAIN="ppc" | |
138 | 120 | - env: |
139 | 121 | - BUILDMAN="mpc8260" |
140 | - TOOLCHAIN="ppc" | |
141 | 122 | - env: |
142 | 123 | - BUILDMAN="mpc83xx" |
143 | - TOOLCHAIN="ppc" | |
144 | 124 | - env: |
145 | 125 | - BUILDMAN="mpc85xx -x freescale" |
146 | - TOOLCHAIN="ppc" | |
147 | 126 | - env: |
148 | 127 | - BUILDMAN="mpc85xx -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x sbc8548 -x bsc91*" |
149 | - TOOLCHAIN="ppc" | |
150 | 128 | - env: |
151 | 129 | - BUILDMAN="t208xrdb t4qds t102*" |
152 | - TOOLCHAIN="ppc" | |
153 | 130 | - env: |
154 | 131 | - BUILDMAN="p1_p2_rdb_pc p1010rdb" |
155 | - TOOLCHAIN="ppc" | |
156 | 132 | - env: |
157 | 133 | - BUILDMAN="corenet_ds b4860qds sbc8548 bsc91*" |
158 | - TOOLCHAIN="ppc" | |
159 | 134 | - env: |
160 | 135 | - BUILDMAN="mpc86xx" |
161 | - TOOLCHAIN="ppc" | |
162 | 136 | - env: |
163 | 137 | - BUILDMAN="mpc8xx" |
164 | - TOOLCHAIN="ppc" | |
165 | 138 | - env: |
166 | 139 | - BUILDMAN="siemens" |
167 | - TOOLCHAIN="arm" | |
168 | 140 | - env: |
169 | 141 | - BUILDMAN="ti" |
170 | - TOOLCHAIN="arm" | |
171 | 142 | - env: |
172 | 143 | - BUILDMAN="aarch64" |
173 | 144 | TOOLCHAIN="aarch64" |