repo: Use separate task for patching repo rev
PATCH 1/2 repo: Use separate task for patching repo rev
From: Jasper Orschulko <[email protected]>
Using a task instead of a version specific patch for setting the repo revision within the source code. This drastically decreases the maintenance burden and easier usage of the OE update helper.
Signed-off-by Jasper Orschulko <[email protected]>
--- .../0001-Set-REPO_REV-to-v2.17.3.patch | 35 ------------------- meta/recipes-devtools/repo/repo_2.17.3.bb | 9 +++-- 2 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00 2001 -From: Jasper Orschulko <[email protected]> -Date: Thu, 4 Nov 2021 16:55:12 +0100 -Subject: [PATCH] Set REPO_REV to v2.17.3 - -repo is an unusual tool because it downloads all of its own Python modules -using GPG-signed git tags, and stores those files as part of the project -that it is working with. - -So in order to have a reproducible repo installation within the project -folders, we hardcode the default REPO_REV to a SHA1 that corresponds to -the version of the recipe. REPO_REV can still be overwriten by the user, -by specifying the REPO_REV environment variable. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Jasper Orschulko <[email protected]> ---- - repo | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/repo b/repo -index 4cddbf1..5c3551f 100755 ---- a/repo -+++ b/repo -@@ -144,7 +144,7 @@ if not REPO_URL: - REPO_URL = 'https://gerrit.googlesource.com/git-repo' - REPO_REV = os.environ.get('REPO_REV') - if not REPO_REV: -- REPO_REV = 'stable' -+ REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc' - # URL to file bug reports for repo tool issues. - BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue' - --- -2.34.0
meta/recipes-devtools/repo/repo_2.17.3.bb +7 -2
@@ -12,13 +12,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main" SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc" -SRC_URI += "file://0001-python3-shebang.patch \ - file://0001-Set-REPO_REV-to-v2.17.3.patch" +SRC_URI += "file://0001-python3-shebang.patch" 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_patch[postfuncs] += "do_set_fixed_rev" + do_install() { install -D ${WORKDIR}/git/repo ${D}${bindir}/repo }
Signature · 1 line
2.34.1
PATCH 2/2 repo: upgrade 2.17.3 -> 2.18
From: Jasper Orschulko <[email protected]>
Signed-off-by Jasper Orschulko <[email protected]>
---
meta/recipes-devtools/repo/{repo_2.17.3.bb => repo_2.18.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/repo/{repo_2.17.3.bb => repo_2.18.bb} (95%)meta/recipes-devtools/repo/repo_2.18.bb renamed from meta/recipes-devtools/repo/repo_2.17.3.bb +1 -1
@@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main" -SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc" +SRCREV = "4a478edb443864561089b2699c9e65c85fc5e036" SRC_URI += "file://0001-python3-shebang.patch"
Signature · 1 line
2.34.1