diff options
author | Uwe Kleine-König <u.kleine-koenig@baylibre.com> | 2025-09-23 17:47:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-09-25 11:09:49 +0100 |
commit | 441313eecbd45cfcbf0368e4d1d54bd2e9e59c6b (patch) | |
tree | b86fcdec4a59afcb6e650551195468714d6f5aee /meta | |
parent | 61ce087049be24f3306e8bb08acbfe2a8151e37c (diff) | |
download | poky-441313eecbd45cfcbf0368e4d1d54bd2e9e59c6b.tar.gz |
meta/lib/oe/recipeutils.py: Handle multi-repo recipes for upgrade check
For a recipe that uses more than one git repo there isn't a single
SRCREV variable. For example for linux-yocto there is SRCREV_machine and
SRCREV_meta and rd.getVar("SRCREV") yields "INVALID".
Luckily bb.fetch2 already handles all the details and exposes the
currently used revision in ud. So just use that.
(From OE-Core rev: ddf00d6aee955878c070327ee8d751fdb6099444)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/recipeutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 044f1bfa61..102789ce73 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py | |||
@@ -1075,7 +1075,7 @@ def get_recipe_upstream_version(rd): | |||
1075 | try: | 1075 | try: |
1076 | revision = ud.method.latest_revision(ud, rd, 'default') | 1076 | revision = ud.method.latest_revision(ud, rd, 'default') |
1077 | upversion = pv | 1077 | upversion = pv |
1078 | if revision != rd.getVar("SRCREV"): | 1078 | if revision != ud.revision: |
1079 | upversion = upversion + "-new-commits-available" | 1079 | upversion = upversion + "-new-commits-available" |
1080 | except bb.fetch2.FetchError as e: | 1080 | except bb.fetch2.FetchError as e: |
1081 | bb.warn("Unable to obtain latest revision: {}".format(e)) | 1081 | bb.warn("Unable to obtain latest revision: {}".format(e)) |