]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
meta/lib/oe/recipeutils.py: Handle multi-repo recipes for upgrade check
authorUwe Kleine-König <u.kleine-koenig@baylibre.com>
Tue, 23 Sep 2025 15:47:02 +0000 (17:47 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 25 Sep 2025 10:09:45 +0000 (11:09 +0100)
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.

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>
meta/lib/oe/recipeutils.py

index 044f1bfa6140074a0cd394689dd06403f927334b..102789ce735ab82140148cefc109a87d4e24890b 100644 (file)
@@ -1075,7 +1075,7 @@ def get_recipe_upstream_version(rd):
             try:
                 revision = ud.method.latest_revision(ud, rd, 'default')
                 upversion = pv
-                if revision != rd.getVar("SRCREV"):
+                if revision != ud.revision:
                     upversion = upversion + "-new-commits-available"
             except bb.fetch2.FetchError as e:
                 bb.warn("Unable to obtain latest revision: {}".format(e))