mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 06:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes: go-vendor: Handle modules from the same repo

Browse Source 
Take into account module version when populating vendor directory,
because a module with the same URL but with a different version tag
could be used as an indirect dependency.

(From OE-Core rev: 8f6320c0858941b2441e290ef3586b48c2700cd1)

Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Vyacheslav Yurkov
2024-01-16 09:23:21 +01:00
committed by Richard Purdie
parent d5e2279d21
commit 3e579c303e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes/go-vendor.bbclass
View File

@@ -103,18 +103,17 @@ python do_go_vendor() {
pathMajor = fetcher.ud[url].parm.get('go_pathmajor')
pathMajor = None if not pathMajor else pathMajor.strip('/')
if not repo in modules:
modules[repo] = { "version": version,
if not (repo, version) in modules:
modules[(repo, version)] = {
"repo_path": os.path.join(import_dir, p),
"module_path": module_path,
"subdir": subdir,
"pathMajor": pathMajor }
for module_key in sorted(modules):
for module_key, module in modules.items():
# only take the version which is explicitly listed
# as a dependency in the go.mod
module = modules[module_key]
module_path = module['module_path']
rootdir = module['repo_path']
subdir = module['subdir']
@@ -139,7 +138,7 @@ python do_go_vendor() {
dst = os.path.join(vendor_dir, module_path)
bb.debug(1, "cp %s --> %s" % (src, dst))
shutil.copytree(src, dst, symlinks=True, \
shutil.copytree(src, dst, symlinks=True, dirs_exist_ok=True, \
ignore=shutil.ignore_patterns(".git", \
"vendor", \
"*._test.go"))