mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

cargo-update-recipe-crates: force name overrides

Browse Source 
A project can have multiple Cargo.lock (provides
multiple binaries for example) and each one can
depends on differenct version of the same crates.
Even within the same Cargo.lock file, it is possible
to have different version of same crates.

To avoid conflicts, override the name with the version
for all crates checksum

Moreover, when searching for Cargo.lock, we should ignore
specific dir like .git (no use to walk down there) and .pc
(because it can have a Cargo.lock if this file was patched)

(From OE-Core rev: 1795e98a04ad09b011afcc7cc3bf6dc49475b19a)

Signed-off-by: Frederic Martinsons <frederic.martinsons@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Frederic Martinsons
2023-03-31 07:45:27 +02:00
committed by Richard Purdie
parent ad460bb6aa
commit 476890160a
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/classes-recipe/cargo-update-recipe-crates.bbclass
View File

@@ -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
# we need to rename crates with name and version to have a unique key
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'])
@@ -69,12 +56,22 @@ import os
crates = "# Autogenerated with 'bitbake -c update_crates ${PN}'\n\n"
found = False
for root, dirs, files in os.walk('${CARGO_LOCK_SRC_DIR}'):
# ignore git and patches directories
if root.startswith(os.path.join('${CARGO_LOCK_SRC_DIR}', '.pc')):
continue
if root.startswith(os.path.join('${CARGO_LOCK_SRC_DIR}', '.git')):
continue
for file in files:
if file == 'Cargo.lock':
crates += get_crates(os.path.join(root, file))
found = True
try:
cargo_lock_path = os.path.join(root, file)
crates += get_crates(os.path.join(root, file))
except Exception as e:
raise ValueError("Cannot parse '%s'" % cargo_lock_path) from e
else:
found = True
if not found:
raise ValueError("Unable to find Cargo.lock in ${CARGO_LOCK_SRC_DIR}")
raise ValueError("Unable to find any Cargo.lock in ${CARGO_LOCK_SRC_DIR}")
open("${TARGET_FILE}", 'w').write(crates)
EOF