phase2: use full git history for reproducibility

[buildbot.git] / phase2 / master.cfg

diff --git a/phase2/master.cfg b/phase2/master.cfg
index 5ed7eff5728da299dee7e01ff416fc11533bf13a..d9ea18f2954799f04fb6c624c3fe55271cdeb7fe 100644 (file)
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -478,6 +478,13 @@ 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",
@@ -487,9 +494,9 @@ for arch in arches:
 
                factory.addStep(ShellCommand(
                        name = "patchfeedsconf",
-                       description = "Patching feeds.conf",
+                       description = "Patching feeds.conf to use SSH cloning",
                        workdir = "build/sdk",
-                       command = "sed -e 's#https://#ssh://git@#g' feeds.conf.default > feeds.conf",
+                       command = "sed -i -e 's#https://#ssh://git@#g' feeds.conf",
                        haltOnFailure = True))
 
        factory.addStep(ShellCommand(