Skip to contentSkip to conversation

lib/oe/recipeutils: honor stable_upgrade for UPSTREAM_CHECK_COMMITS recipes

PATCH New [email protected] 1 participant 1 message Sep 30

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 lib/oe/recipeutils: honor stable_upgrade for UPSTREAM_CHECK_COMMITS recipes

From: Daniel Turull <[email protected]>

Found running AUH --stable on wrynose: recipes with UPSTREAM_CHECK_COMMITS set (gnu-config, gn, piglit, etc.) always reported "-new-commits-available" regardless of stable_upgrade, since that check ran before stable_upgrade was ever consulted.

AI-Generated: kiro:claude-sonnet-5

---
v2: restructure the UPSTREAM_CHECK_COMMITS/stable_upgrade conditional as a nested if/else instead of if/elif on the same condition, ordered to mirror the stable_upgrade/else branch below it, for clarity. (feedback from Alex)

---
 meta/lib/oe/recipeutils.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)
meta/lib/oe/recipeutils.py +16 -9
index 99e7bc7acf..522537e0d9 100644
@@ -1069,16 +1069,23 @@ def get_recipe_upstream_version(rd, stable_upgrade=False):
     else:
         ud = bb.fetch.FetchData(src_uri, rd)
         if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
-            bb.fetch.get_srcrev(rd)
-            upversion = None
-            revision = None
-            try:
-                revision = ud.method.latest_revision(ud, rd, ud.name)
+            if stable_upgrade:
+                # UPSTREAM_CHECK_COMMITS recipes only track git HEAD, not a
+                # version number, so there's no way to filter for a "stable"
+                # release; treat as no update available.
                 upversion = pv
-                if revision != ud.revision:
-                    upversion = upversion + "-new-commits-available"
-            except bb.fetch.FetchError as e:
-                bb.warn("Unable to obtain latest revision: {}".format(e))
+                revision = None
+            else:
+                bb.fetch.get_srcrev(rd)
+                upversion = None
+                revision = None
+                try:
+                    revision = ud.method.latest_revision(ud, rd, ud.name)
+                    upversion = pv
+                    if revision != ud.revision:
+                        upversion = upversion + "-new-commits-available"
+                except bb.fetch.FetchError as e:
+                    bb.warn("Unable to obtain latest revision: {}".format(e))
         else:
             if stable_upgrade:
                 stable_release_regex = rd.getVar("UPSTREAM_STABLE_RELEASE_REGEX")