gnome_verdir() stripped the last version component to build the download
directory, which broke four-component versions: libsecret 0.21.8.2 was
fetched from 0.21.8/ instead of GNOME's 0.21/, causing a 404.

Use the first two components instead. This is unchanged for all existing
gnomebase recipes and fixes four-component versions.

Signed-off-by: Jaipaul Cheernam <[email protected]>
---
 meta/classes-recipe/gnomebase.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes-recipe/gnomebase.bbclass 
b/meta/classes-recipe/gnomebase.bbclass
index 57933dda71..e5aac95a16 100644
--- a/meta/classes-recipe/gnomebase.bbclass
+++ b/meta/classes-recipe/gnomebase.bbclass
@@ -5,7 +5,12 @@
 #
 
 def gnome_verdir(v):
-    return ".".join(v.split(".")[:-1]) or v
+    # GNOME hosts tarballs under the major.minor directory (major only for
+    # two-component versions). Take the first two components rather than
+    # stripping the last, so four-component versions (e.g. 0.21.8.2 -> 0.21)
+    # resolve correctly.
+    parts = v.split(".")
+    return ".".join(parts[:2] if len(parts) >= 3 else parts[:-1]) or v
 
 
 GNOME_COMPRESS_TYPE ?= "xz"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#246044): 
https://lists.openembedded.org/g/openembedded-core/message/246044
Mute This Topic: https://lists.openembedded.org/mt/121292860/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to