diff options
| author | Simon Glass <sjg@chromium.org> | 2020-03-18 09:42:50 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-10 21:24:41 -0400 |
| commit | bf0a81330dc39f156144b239c2075029dbca7514 (patch) | |
| tree | bed218293754469ae6046f6efe7e9364491b4ef3 | |
| parent | e7c05b1fda999e5676289386a956dc56df03eec2 (diff) | |
| download | u-boot-bf0a81330dc39f156144b239c2075029dbca7514.tar.gz | |
gitlab/azure: Use the -w option for sandbox_spl
Avoid needing to know about the internal .bm-work directory, by passing
the -w flag to buildman.
This does not affect travis since the previous commit already used the -w
flag.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | .azure-pipelines.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 65e07bf20a..339ad8359d 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -136,10 +136,10 @@ jobs: virtualenv -p /usr/bin/python3 /tmp/venv . /tmp/venv/bin/activate pip install pyelftools pytest - export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl + export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH} - ./tools/buildman/buildman -o /tmp -P sandbox_spl + ./tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w sandbox_spl ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test ./tools/buildman/buildman -t ./tools/dtoc/dtoc -t diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf39435631..a84bc3e1ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -176,10 +176,10 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: virtualenv -p /usr/bin/python3 /tmp/venv; . /tmp/venv/bin/activate; pip install pyelftools pytest; - export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl; + export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; - ./tools/buildman/buildman -o /tmp -P sandbox_spl; + ./tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w sandbox_spl; ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test; ./tools/buildman/buildman -t; ./tools/dtoc/dtoc -t; |