Skip to contentSkip to conversation

classes/gnomebase: improve gnome_verdir() logic

PATCH New Ross Burton 1 participant 1 message Sep 23

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 classes/gnomebase: improve gnome_verdir() logic

libsecret released 0.21.8.2, which broke our gnome_verdir() logic used to construct a SRC_URI.

Rewrite the logic, using the code that the GNOME servers use to generate these URLs in the first place. This looks at the major version, if it's above 40 then just the major version is used, otherwise the first two components are used.

---
 meta/classes-recipe/gnomebase.bbclass | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
meta/classes-recipe/gnomebase.bbclass +10 -1
index 57933dda71a..69f1e37e082 100644
@@ -5,7 +5,16 @@
 #
 
 def gnome_verdir(v):
-    return ".".join(v.split(".")[:-1]) or v
+    # Upstream treats a major of 40+ as a flag day to switch between major.minor
+    # versioned directories, or just major.
+    # See get_majmin() in
+    # https://gitlab.gnome.org/Infrastructure/openshift-images/gnome-release-service/-/blob/main/gnome_release_service/gnome_release_system/utils.py
+    parts = v.split(".")
+    major = int(parts[0])
+    if major >= 40:
+        return major
+    else:
+        return ".".join(parts[:2])
 
 
 GNOME_COMPRESS_TYPE ?= "xz"
Signature · 1 line
2.43.0