phase1: remove isChangeBuiltin() handling

[buildbot.git] / phase1 / master.cfg

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 908087e6714a37ade729a1c26121b4f1cfa7d12c..6030def4622d8117b90af1329f8795ba437c2be3 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -82,6 +82,9 @@ if ini.has_option("gpg", "passfile"):
 # find targets
 targets = [ ]
 
+if not os.path.isdir(home_dir+'/source.git'):
+       subprocess.call(["git", "clone", "--depth=1", repo_url, home_dir+'/source.git'])
+
 findtargets = subprocess.Popen([home_dir+'/dumpinfo.pl', 'targets'],
        stdout = subprocess.PIPE, cwd = home_dir+'/source.git')
 
@@ -156,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'] = []
 
@@ -446,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
        ))
 
@@ -462,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
        ))
 
@@ -470,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
        ))
 
@@ -529,7 +485,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
        factory.addStep(ShellCommand(
                name = "targetupload",
                description = "Uploading target files",
-               command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", WithProperties("bin/targets/%s/%s%%(libc)s/" %(ts[0], ts[1])), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+               command=["rsync", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", WithProperties("bin/targets/%s/%s%%(libc)s/" %(ts[0], ts[1])), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
                env={'RSYNC_PASSWORD': rsync_bin_key},
                haltOnFailure = True,
                logEnviron = False
@@ -539,7 +495,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
                factory.addStep(ShellCommand(
                        name = "sourceupload",
                        description = "Uploading source archives",
-                       command=["rsync", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
+                       command=["rsync", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
                        env={'RSYNC_PASSWORD': rsync_src_key},
                        haltOnFailure = True,
                        logEnviron = False