Re: [PATCH v2 25/32] gitlab: Disable SDL when building sandbox

2020-02-05 Thread sjg
I am not sure how to add libsdl2-dev to the gitlab image, so disable
building sandbox with SDL for now.

Signed-off-by: Simon Glass 
---

Changes in v2: None

 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Applied to u-boot-dm, thanks!


[PATCH v2 25/32] gitlab: Disable SDL when building sandbox

2020-02-03 Thread Simon Glass
I am not sure how to add libsdl2-dev to the gitlab image, so disable
building sandbox with SDL for now.

Signed-off-by: Simon Glass 
---

Changes in v2: None

 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7ca5967dd..303e6b01b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,8 @@ stages:
 # use clang only do one configuration.
 - if [[ "${BUILDMAN}" != "" ]]; then
 ret=0;
-tools/buildman/buildman -o /tmp -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?;
+NO_SDL=1 tools/buildman/buildman -o /tmp -P -E ${BUILDMAN}
+  ${OVERRIDE}|| ret=$?;
 if [[ $ret -ne 0 && $ret -ne 129 ]]; then
   tools/buildman/buildman -o /tmp -sdeP ${BUILDMAN};
   exit $ret;
@@ -164,7 +165,7 @@ Run binman, buildman, dtoc and patman testsuites:
   export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/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;
+  NO_SDL=1 ./tools/buildman/buildman -o /tmp -P sandbox_spl;
   ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test;
   ./tools/buildman/buildman -t;
   ./tools/dtoc/dtoc -t;
-- 
2.25.0.341.g760bfbb309-goog