From 80da7fa93ba954aa09b2a10a43fea6e8f737657a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Mon, 24 Oct 2022 16:41:00 +0200 Subject: [PATCH] phase1: abort early if current builder does not apply MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Some builders (target/subtarget) may only apply to particular branches, but are nevertheless defined for all branches. Detect such case early, stop the build but do not mark it FAILURE. Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 9453958..e3a2d3e 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -722,15 +722,16 @@ for target in targets: env = MakeEnv() )) - # check arch + # check arch - exit early if does not exist - NB: some targets do not define CONFIG_TARGET_target_subtarget factory.addStep(ShellCommand( name = "checkarch", description = "Checking architecture", - command = ["grep", "-sq", "CONFIG_TARGET_%s=y" %(ts[0]), ".config"], + command = 'grep -sq CONFIG_TARGET_%s=y .config && grep -sq CONFIG_TARGET_SUBTARGET=\\"%s\\" .config' %(ts[0], ts[1]), logEnviron = False, want_stdout = False, want_stderr = False, - haltOnFailure = True + haltOnFailure = True, + flunkOnFailure = False, # this is not a build FAILURE )) # find libc suffix -- 2.30.2