diff mbox series

[25/33] gitlab: Disable SDL when building sandbox

Message ID	20200112120216.25.Iaee17a76e11695cca8b49a80cb8c8e2ca3f3a170@changeid
State	Superseded
Headers	show List-Id: U-Boot discussion <u-boot.lists.denx.de> From: sjg at chromium.org (Simon Glass) Date: Sun, 12 Jan 2020 12:06:16 -0700 Subject: [PATCH 25/33] gitlab: Disable SDL when building sandbox In-Reply-To: <20200112190624.79077-1-sjg@chromium.org> References: <20200112190624.79077-1-sjg@chromium.org> Message-ID: <20200112120216.25.Iaee17a76e11695cca8b49a80cb8c8e2ca3f3a170@changeid>
Series	sandbox: Move to SDL2 \| expand [00/33] sandbox: Move to SDL2 [01/33] sandbox: Sort the help options [02/33] video: Support truetype fonts on a 32-bit display [03/33] video: sandbox: Enable all colour depths [04/33] mailbox: Rename free() to rfree() [05/33] power-domain: Rename free() to rfree() [06/33] reset: Rename free() to rfree() [07/33] gpio: Rename free() to rfree() [08/33] clk: Rename free() to rfree() [09/33] dma: Rename free() to rfree() [10/33] mtd: Rename free() to rfree() [11/33] sandbox: Rename 'free' variable [12/33] sandbox: Use a prefix for all allocation functions [13/33] exports: Add the malloc.h header [14/33] string: Allow arch override of strndup() also [15/33] sandbox: Rename strdup() functions [16/33] sandbox: Drop use of special os_malloc() where possible [17/33] sandbox: Drop os_realloc() [18/33] sandbox: Ensure that long-options array is terminated [19/33] sandbox: Add a new header for the system malloc() [20/33] sound: Add a new stop_play() method [21/33] sandbox: sound: Handle errors better in sound_beep() [22/33] sandbox: Add comments to the sdl struct [23/33] sandbox: sdl: Improve error handling [24/33] sandbox: sdl: Support waiting for audio to complete [25/33] gitlab: Disable SDL when building sandbox [26/33] sandbox: sdl: Move to use SDL2 [27/33] sandbox: sdl: Add an option to double the screen size [28/33] sandbox: Support changing the LCD colour depth [29/33] dm: core: Require users of devres to include the header [30/33] dm: core: Create a new header file for 'compat' features [31/33] dm: core: Drop the inclusion of linux/compat.h in dm.h [32/33] sandbox: Complete migration away from os_malloc() [33/33] video: Drop the Nimbus font

Commit Message

Simon Glass Jan. 12, 2020, 7:06 p.m. UTC

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 <sjg at chromium.org>
---

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

diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d799cc30a8..5fb2113987 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;