diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-02-17 17:09:26 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-18 11:37:11 +0000 |
| commit | 933e8c828201d8adf28246d415a9fd229c619564 (patch) | |
| tree | 755bd4d43071666c3c55d44ece66ea8cdcb72d79 | |
| parent | 3f56d67975b0a84bb6a538b40a65fa5f33aadd96 (diff) | |
| download | poky-933e8c828201d8adf28246d415a9fd229c619564.tar.gz | |
repo: upgrade 2.20 -> 2.21
sed-patch the sources from do_configure, as otherwise
this breaks automated updates (devtool creates a patch
out of changes done by sed).
(From OE-Core rev: 7070f8a4ce56656720b43cbb68097f46d9213bdc)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/repo/repo_2.21.bb (renamed from meta/recipes-devtools/repo/repo_2.20.bb) | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-devtools/repo/repo_2.20.bb b/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" | |||
| 12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ |
| 13 | file://0001-python3-shebang.patch \ | 13 | file://0001-python3-shebang.patch \ |
| 14 | " | 14 | " |
| 15 | SRCREV = "98bb76577d9e7e0ffdeb643f1654ec006f6bbc8c" | 15 | SRCREV = "8e91248655acf1c8044ed8c1b265b804a99eb07f" |
| 16 | 16 | ||
| 17 | MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" | 17 | MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" |
| 18 | 18 | ||
| 19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
| 20 | 20 | ||
| 21 | do_set_fixed_rev() { | 21 | do_configure:prepend() { |
| 22 | sed -Ei "s/REPO_REV\s*=\s*('|\")stable('|\")/REPO_REV = '${SRCREV}'/g" ${S}/repo | 22 | sed -Ei "s/REPO_REV\s*=\s*('|\")stable('|\")/REPO_REV = '${SRCREV}'/g" ${S}/repo |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | do_patch[postfuncs] += "do_set_fixed_rev" | ||
| 26 | |||
| 27 | do_install() { | 25 | do_install() { |
| 28 | install -D ${WORKDIR}/git/repo ${D}${bindir}/repo | 26 | install -D ${WORKDIR}/git/repo ${D}${bindir}/repo |
| 29 | } | 27 | } |
