From 55be88aaeca4e0e6cd2d0d8de1eeb58e6da07a29 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 4 Nov 2016 15:58:46 +0100 Subject: [PATCH] phase1: remove isChangeBuiltin() handling The builtin file detection logic is stubbed since quite a while already so simply drop it now. Signed-off-by: Jo-Philipp Wich --- phase1/master.cfg | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 4ff4ced..6030def 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -159,50 +159,6 @@ def IsAffected(pattern): return False return CheckAffected -def isPathBuiltin(path): - incl = {} - pkgs = {} - conf = open(".config", "r") - - while True: - line = conf.readline() - if line == '': - break - m = re.match("^(CONFIG_PACKAGE_.+?)=y", line) - if m: - incl[m.group(1)] = True - - conf.close() - - deps = open("tmp/.packagedeps", "r") - - while True: - line = deps.readline() - if line == '': - break - m = re.match("^package-\$\((CONFIG_PACKAGE_.+?)\) \+= (\S+)", line) - if m and incl.get(m.group(1)) == True: - pkgs["package/%s" % m.group(2)] = True - - deps.close() - - while path != '': - if pkgs.get(path) == True: - return True - path = os.path.dirname(path) - - return False - -def isChangeBuiltin(change): - return True -# for request in change.build.requests: -# for source in request.sources: -# for change in source.changes: -# for file in change.files: -# if isPathBuiltin(file): -# return True -# return False - c['builders'] = [] @@ -449,7 +405,6 @@ EOT''' %(ts[0], ts[0], ts[1]) )) name = "pkginstall", description = "Installing packages", command=["make", WithProperties("-j%(nproc:~4)s"), "package/install", "V=s"], - doStepIf = isChangeBuiltin, haltOnFailure = True )) @@ -465,7 +420,6 @@ EOT''' %(ts[0], ts[0], ts[1]) )) name = "images", description = "Building images", command=["make", WithProperties("-j%(nproc:~4)s"), "target/install", "V=s"], - doStepIf = isChangeBuiltin, haltOnFailure = True )) @@ -473,7 +427,6 @@ EOT''' %(ts[0], ts[0], ts[1]) )) name = "checksums", description = "Calculating checksums", command=["make", "-j1", "checksum", "V=s"], - doStepIf = isChangeBuiltin, haltOnFailure = True )) -- 2.30.2