phase1: buildfactory: remove deadcode

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 8c708d293162c9530898aa497155174b74b950e1..38df7f533ae8683632d09ecdf1b8bde3eb3f58be 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -764,12 +764,6 @@ for target in targets:
                command=["rm", "-rf", "tmp/"]))
 
        # feed
-#      factory.addStep(ShellCommand(
-#              name = "feedsconf",
-#              description = "Copy the feeds.conf",
-#              command='''cp ~/feeds.conf ./feeds.conf''' ))
-
-       # feed
        factory.addStep(ShellCommand(
                name = "rmfeedlinks",
                description = "Remove feed symlinks",
@@ -934,7 +928,6 @@ for target in targets:
                description = "Building kmods",
                command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "target/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
                env = MakeEnv(),
-               #env={'BUILD_LOG_DIR': 'bin/%s' %(ts[0])},
                haltOnFailure = True
        ))
 
@@ -958,7 +951,6 @@ for target in targets:
                description = "Building packages",
                command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "package/compile", "V=s", "IGNORE_ERRORS=n m", "BUILD_LOG=1"],
                env = MakeEnv(),
-               #env={'BUILD_LOG_DIR': 'bin/%s' %(ts[0])},
                haltOnFailure = True
        ))
 
@@ -1205,34 +1197,6 @@ for target in targets:
                        locks = NetLockUl,
                ))
 
-       if False:
-               factory.addStep(ShellCommand(
-                       name = "packageupload",
-                       description = "Uploading package files",
-                       command=["../rsync.sh", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-a"] + rsync_bin_defopts + ["bin/packages/", "%s/packages/" %(rsync_bin_url)],
-                       env={'RSYNC_PASSWORD': rsync_bin_key},
-                       haltOnFailure = False,
-                       flunkOnFailure = False,
-                       warnOnFailure = True,
-                       logEnviron = False,
-                       locks = NetLockUl,
-               ))
-
-       # logs
-       if False:
-               factory.addStep(ShellCommand(
-                       name = "upload",
-                       description = "Uploading logs",
-                       command=["../rsync.sh", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-az"] + rsync_bin_defopts + ["logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
-                       env={'RSYNC_PASSWORD': rsync_bin_key},
-                       haltOnFailure = False,
-                       flunkOnFailure = False,
-                       warnOnFailure = True,
-                       alwaysRun = True,
-                       logEnviron = False,
-                       locks = NetLockUl,
-               ))
-
        factory.addStep(ShellCommand(
                name = "df",
                description = "Reporting disk usage",