diff mbox series

[15/28] repo: upgrade 2.20 -> 2.21

Message ID 20220217160939.1424397-15-alex@linutronix.de
State Accepted, archived
Commit 7070f8a4ce56656720b43cbb68097f46d9213bdc
Headers show
Series [01/28] gdb: update 11.1 -> 11.2 | expand

Commit Message

Alexander Kanavin Feb. 17, 2022, 4:09 p.m. UTC 
From: Alexander Kanavin <alex.kanavin@gmail.com>

sed-patch the sources from do_configure, as otherwise
this breaks automated updates (devtool creates a patch
out of changes done by sed).

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/repo/{repo_2.20.bb => repo_2.21.bb} | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/repo/{repo_2.20.bb => repo_2.21.bb} (82%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/repo/repo_2.20.bb b/meta/recipes-devtools/repo/repo_2.21.bb
similarity index 82%
rename from meta/recipes-devtools/repo/repo_2.20.bb
rename to meta/recipes-devtools/repo/repo_2.21.bb
index b56559fd9a..3c50793401 100644
--- a/meta/recipes-devtools/repo/repo_2.20.bb
+++ b/meta/recipes-devtools/repo/repo_2.21.bb
@@ -12,18 +12,16 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \
            file://0001-python3-shebang.patch \
            "
-SRCREV = "98bb76577d9e7e0ffdeb643f1654ec006f6bbc8c"
+SRCREV = "8e91248655acf1c8044ed8c1b265b804a99eb07f"
 
 MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"
 
 S = "${WORKDIR}/git"
 
-do_set_fixed_rev() {
-    sed -Ei "s/REPO_REV\s*=\s*('|\")stable('|\")/REPO_REV = '${SRCREV}'/g" ${S}/repo
+do_configure:prepend() {
+	sed -Ei "s/REPO_REV\s*=\s*('|\")stable('|\")/REPO_REV = '${SRCREV}'/g" ${S}/repo
 }
 
-do_patch[postfuncs] += "do_set_fixed_rev"
-
 do_install() {
 	install -D ${WORKDIR}/git/repo ${D}${bindir}/repo
 }