1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-05 14:29:48 +00:00

repo: Use separate task for patching repo rev

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.

(From OE-Core rev: beb5878bfd600ba8c9b53aa9d6b038838697b97d)

Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jasper Orschulko
2021-12-06 19:15:12 +01:00
committed by Richard Purdie
parent ddc5baf4d9
commit 4d965f9326
2 changed files with 7 additions and 37 deletions
@@ -1,35 +0,0 @@
From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00 2001
From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
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 <Jasper.Orschulko@iris-sensing.com>
---
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
+7 -2
View File
@@ -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
}