From f29065127900568085746a4b2dff452a67abea7b Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 12 Sep 2024 23:06:14 +0200 Subject: [PATCH] bitbake: fetch2/gomod: Support URIs with only a hostname When calculating the module name for a gomod URI with only a hostname, e.g.: gomod://go.opencensus.io;version=v0.24.0;sha256sum=203a767d7f8e7c1ebe5588220ad168d1e15b14ae70a636de7ca9a4a88a7e0d0c the non-existing path would actually be treated as "/", which resulted in a trailing slash being added to the module name preventing the unpack method from correctly locating the go.mod file. (Bitbake rev: f0e02e1de4d649e647e4ab61341042dd38d0eeb0) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/gomod.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/fetch2/gomod.py b/bitbake/lib/bb/fetch2/gomod.py index 1b532d03ff..21fbe80f56 100644 --- a/bitbake/lib/bb/fetch2/gomod.py +++ b/bitbake/lib/bb/fetch2/gomod.py @@ -103,7 +103,9 @@ class GoMod(Wget): if 'version' not in ud.parm: raise MissingParameterError('version', ud.url) - module = ud.host + ud.path + module = ud.host + if ud.path != '/': + module += ud.path ud.parm['module'] = module # Set URL and filename for wget download @@ -174,7 +176,9 @@ class GoModGit(Git): if 'version' not in ud.parm: raise MissingParameterError('version', ud.url) - module = ud.host + ud.path + module = ud.host + if ud.path != '/': + module += ud.path ud.parm['module'] = module # Set host, path and srcrev for git download