From f39ee8cfdebc2b4af7e86a550222e0fd292d6ebb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Mon, 13 Nov 2023 17:32:34 +0100 Subject: [PATCH] Revert "phase2: use full git history for reproducibility" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Following openwrt/11bb5337b8d8b5018e48f0df415efb99e2f49d0d we no longer need the full git history. This reverts commit 5b96616d056e26adbd50cc73a5e51b8449110b7d. Signed-off-by: Thibaut VARÈNE --- phase2/master.cfg | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/phase2/master.cfg b/phase2/master.cfg index b0aacc5..3d0ac11 100644 --- 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( -- 2.30.2