Skip to contentSkip to conversation

lib/oe/recipeutils: honor stable_upgrade for UPSTREAM_CHECK_COMMITS recipes

PATCH Superseded [email protected] 2 participants 3 messages Sep 28 – Sep 29

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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

---
 meta/lib/oe/recipeutils.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
meta/lib/oe/recipeutils.py +7 -1
index 99e7bc7acf..7b8594a612 100644
@@ -1068,7 +1068,7 @@ def get_recipe_upstream_version(rd, stable_upgrade=False):
         ru['datetime'] = datetime.now()
     else:
         ud = bb.fetch.FetchData(src_uri, rd)
-        if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
+        if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1" and not stable_upgrade:
             bb.fetch.get_srcrev(rd)
             upversion = None
             revision = None
@@ -1079,6 +1079,12 @@ def get_recipe_upstream_version(rd, stable_upgrade=False):
                     upversion = upversion + "-new-commits-available"
             except bb.fetch.FetchError as e:
                 bb.warn("Unable to obtain latest revision: {}".format(e))
+        elif rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
+            # 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
+            revision = None
         else:
             if stable_upgrade:
                 stable_release_regex = rd.getVar("UPSTREAM_STABLE_RELEASE_REGEX")
#1 lore raw
Quoted 7 lines · Daniel Turull via lists.openembedded.org
(quoted diff) +1 -1
-        if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
+        if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1" and not

stable_upgrade:
bb.fetch.get_srcrev(rd)
upversion = None
revision = None

(quoted diff) +0 -0
@@ -1079,6 +1079,12 @@ def get_recipe_upstream_version(rd,
Quoted 5 lines

stable_upgrade=False):
upversion = upversion + "-new-commits-available"
except bb.fetch.FetchError as e:
bb.warn("Unable to obtain latest revision: {}".format(e))
+ elif rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":

It took me a moment (and inspecting the actual code as it is now) to
realize that you're modifying the same if block, and adding an elif to it:

if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1" and not stable_upgrade:
... // yocto master
elif rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
... // stable yocto release

I assume AI can't see that it made the conditional logic less understandable than it was, but you should. Better:

if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
if not stable_upgrade:
...
else:
...

Alex

#2 lore raw
Quoted 23 lines · Alexander Kanavin
Quoted 11 lines · Daniel Turull via lists.openembedded.org

-        if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
+        if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1" and not stable_upgrade:
             bb.fetch.get_srcrev(rd)
             upversion = None
             revision = None

(quoted diff) +0 -0
@@ -1079,6 +1079,12 @@ def get_recipe_upstream_version(rd, stable_upgrade=False):

                     upversion = upversion + "-new-commits-available" except bb.fetch.FetchError as e:
                 bb.warn("Unable to obtain latest revision: {}".format(e)) +        elif rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":

 It took me a moment (and inspecting the actual code as it is now) to realize that you're modifying the same if block, and adding an elif to it:

if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1" and not stable_upgrade:
 ... // yocto master
elif rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
... // stable yocto release

I assume AI can't see that it made the conditional logic less understandable than it was, but you should. Better:

Quoted 7 lines

if rd.getVar("UPSTREAM_CHECK_COMMITS") == "1":
  if not stable_upgrade:
  ...
  else:
  ...

Alex

Actually it was me instructing to modify as less code as possible. I had a flat if elif else version. I'll send a v2 with a more clear logic and rewrite the whole if section.

Best regards,
Daniel