From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/6] travis-ci: centralize ~/.buildman editing
Date: Thu, 27 Oct 2016 06:21:45 +0200 [thread overview]
Message-ID: <581180D9.4090304@denx.de> (raw)
In-Reply-To: <20161026170536.2367-3-swarren@wwwdotorg.org>
Hello Stephen,
Am 26.10.2016 um 19:05 schrieb Stephen Warren:
> From: Stephen Warren <swarren@nvidia.com>
>
> Any time an x86 toolchain is used, we need to edit ~/.buildman to
> reference it. Move the editing logic into a central place so that it
> doesn't have to be duplicated everywhere that uses the x86 toolchain;
> future patches will add additional cases where it's used.
>
> It would be nice if we could unconditionally write all of ~/.buildman at
> once. Unfortunately, buildman fails if any toolchain mentioned in a
> toolchain-prefix entry doesn't exist, even if it doesn't need to use it
> for the current build.
>
> The sandbox/x86 build definition currently does nothing more than edit
> ~/.buildman; no builds are run. Fix this by not defining a custom script
> for this build, and hence preventing that stanza from replacing the
> default script.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> .travis.yml | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
Thanks!
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
>
> diff --git a/.travis.yml b/.travis.yml
> index 33685ce14777..119dec8df5b2 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -62,7 +62,10 @@ before_script:
> - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; 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}" == *x86_64* ]]; then
> + ./tools/buildman/buildman --fetch-arch x86_64;
> + echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman;
> + fi
> - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then ./tools/buildman/buildman --fetch-arch xtensa ; fi
>
> script:
> @@ -104,8 +107,6 @@ matrix:
> - env:
> - BUILDMAN="sandbox x86"
> TOOLCHAIN="x86_64"
> - script:
> - - 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
next prev parent reply other threads:[~2016-10-27 4:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-26 17:05 [U-Boot] [PATCH 1/6] travis-ci: Use = not : when writing ~/.buildman Stephen Warren
2016-10-26 17:05 ` [U-Boot] [PATCH 2/6] travis-ci: use correct exit code on errors Stephen Warren
2016-10-27 4:21 ` Heiko Schocher
2016-10-29 17:41 ` [U-Boot] [U-Boot, " Tom Rini
2016-10-26 17:05 ` [U-Boot] [PATCH 3/6] travis-ci: centralize ~/.buildman editing Stephen Warren
2016-10-27 4:21 ` Heiko Schocher [this message]
2016-10-29 17:41 ` [U-Boot] [U-Boot, " Tom Rini
2016-10-26 17:05 ` [U-Boot] [PATCH 4/6] travis-ci: use buildman -P everywhere Stephen Warren
2016-10-27 4:22 ` Heiko Schocher
2016-10-29 17:41 ` [U-Boot] [U-Boot,4/6] " Tom Rini
2016-10-26 17:05 ` [U-Boot] [PATCH 5/6] travis-ci: don't invoke exit on success Stephen Warren
2016-10-27 6:12 ` Heiko Schocher
2016-10-29 17:41 ` [U-Boot] [U-Boot,5/6] " Tom Rini
2016-10-26 17:05 ` [U-Boot] [PATCH 6/6] travis-ci: compile with buildman when running test/py Stephen Warren
2016-10-26 18:56 ` Stephen Warren
2016-10-26 18:59 ` Tom Rini
2016-10-26 19:04 ` Stephen Warren
2016-10-27 6:13 ` Heiko Schocher
2016-10-29 17:41 ` [U-Boot] [U-Boot, " Tom Rini
2016-10-27 4:20 ` [U-Boot] [PATCH 1/6] travis-ci: Use = not : when writing ~/.buildman Heiko Schocher
2016-10-29 17:41 ` [U-Boot] [U-Boot, " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=581180D9.4090304@denx.de \
--to=hs@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox