From 8f34b39c74587f9bec716db17587cbcc43d5d51e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Thu, 20 Oct 2022 12:34:48 +0200 Subject: [PATCH] phase1: remove dead step CleanTargetMap MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 43e1b29..ecd06a1 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -379,24 +379,6 @@ c['schedulers'].append(ForceScheduler( # what steps, and which workers can execute them. Note that any particular build will # only take place on one worker. -CleanTargetMap = [ - [ "tools", "tools/clean" ], - [ "chain", "toolchain/clean" ], - [ "linux", "target/linux/clean" ], - [ "dir", "dirclean" ], - [ "dist", "distclean" ] -] - -def IsMakeCleanRequested(pattern): - def CheckCleanProperty(step): - val = step.getProperty("clean") - if val and re.match(pattern, val): - return True - else: - return False - - return CheckCleanProperty - def IsSharedWorkdir(step): return bool(step.getProperty("shared_wd")) @@ -663,16 +645,6 @@ for target in targets: doStepIf = IsCleanupRequested, timeout = 2400)) - # user-requested clean targets - for tuple in CleanTargetMap: - factory.addStep(ShellCommand( - name = tuple[1], - description = 'User-requested "make %s"' % tuple[1], - command = ["make", tuple[1], "V=s"], - env = MakeEnv(), - doStepIf = IsMakeCleanRequested(tuple[0]) - )) - # Workaround bug when switching from a checked out tag back to a branch # Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-June/017809.html factory.addStep(ShellCommand( -- 2.30.2