Revert "phase2: use full git history for reproducibility"

[buildbot.git] / phase2 / master.cfg

diff --git a/phase2/master.cfg b/phase2/master.cfg
index b0aacc54ab0f08d0b234ac1ac80b276e3d0cd87d..3d0ac1192d357c3d6c2ec222bcedef03c2ea7b43 100644 (file)
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -572,13 +572,6 @@ for arch in arches:
                command = ["./ccache.sh"],
                haltOnFailure = True))
 
-       factory.addStep(ShellCommand(
-               name = "patchfeedsconfgitfull",
-               description = "Patching feeds.conf to use src-git-full",
-               workdir = "build/sdk",
-               command = "sed -e 's#^src-git #src-git-full #g' feeds.conf.default > feeds.conf",
-               haltOnFailure = True))
-
        if git_ssh:
                factory.addStep(StringDownload(
                        name = "dlgitclonekey",
@@ -588,9 +581,9 @@ for arch in arches:
 
                factory.addStep(ShellCommand(
                        name = "patchfeedsconf",
-                       description = "Patching feeds.conf to use SSH cloning",
+                       description = "Patching feeds.conf",
                        workdir = "build/sdk",
-                       command = "sed -i -e 's#https://#ssh://git@#g' feeds.conf",
+                       command = "sed -e 's#https://#ssh://git@#g' feeds.conf.default > feeds.conf",
                        haltOnFailure = True))
 
        factory.addStep(ShellCommand(