summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-03-30 23:22:28 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2023-03-30 23:28:50 +0200
commit0690ca2ef3bbc5faf84bb48dd046434cde6fffad (patch)
tree72e87fcacd2baa96330e1f7ec50100b40ac254e3
parentc3fe173d5196506d89aa464ba56aabcf581a60db (diff)
downloadopenembedded-core-contrib-jansa/cargo.tar.gz
cargo-update-recipe-crates.bbclass: always use name parameterjansa/cargo
* even if there is only one version per Cargo.lock file, there might be other Cargo.lock files with the same crate but different version * we would need to process all Cargo.lock files at the same time before writting but it's easier to just use name paramter even when there is only one version Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/classes-recipe/cargo-update-recipe-crates.bbclass17
1 files changed, 2 insertions, 15 deletions
diff --git a/meta/classes-recipe/cargo-update-recipe-crates.bbclass b/meta/classes-recipe/cargo-update-recipe-crates.bbclass
index daa363b0dd..05e1f090ae 100644
--- a/meta/classes-recipe/cargo-update-recipe-crates.bbclass
+++ b/meta/classes-recipe/cargo-update-recipe-crates.bbclass
@@ -38,25 +38,12 @@ def get_crates(f):
if not crates_candidates:
raise ValueError("Unable to find any candidate crates that use crates.io")
- # Build a list of crates name that have multiple version
- crates_multiple_vers = []
- tmp = []
- for c in crates_candidates:
- if c['name'] in tmp:
- crates_multiple_vers.append(c['name'])
- else:
- tmp.append(c['name'])
-
# Update crates uri and their checksum, to avoid name clashing on the checksum
# we need to rename crates of the same name but different version
cksum_list = ''
for c in crates_candidates:
- if c['name'] in crates_multiple_vers:
- rename = "%s-%s" % (c['name'], c['version'])
- c_list += '\n crate://crates.io/%s/%s;name=%s \\\' % (c['name'], c['version'], rename)
- else:
- rename = c['name']
- c_list += '\n crate://crates.io/%s/%s \\\' % (c['name'], c['version'])
+ rename = "%s-%s" % (c['name'], c['version'])
+ c_list += '\n crate://crates.io/%s/%s;name=%s \\\' % (c['name'], c['version'], rename)
if 'checksum' in c:
cksum_list += '\nSRC_URI[%s.sha256sum] = "%s"' % (rename, c['checksum'])