diff options
author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2023-04-05 14:21:25 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-04-06 14:28:54 +0100 |
commit | ae2efb05196f9e29ef56ad9a84e2eae5fbdd8030 (patch) | |
tree | 8d16aa8172bbbffff89cd98c8325c1be2e1a77d5 | |
parent | 46e1ea2e9a203992bb4de48ea21a8e736419ada2 (diff) | |
download | bitbake-ae2efb05196f9e29ef56ad9a84e2eae5fbdd8030.tar.gz |
fetch2/crate: create versioned 'name' entries
It is common for rust packages to depend on different versions of the
same crate. E.g.
| crate://crates.io/windows_x86_64_msvc/0.42.2 \
| crate://crates.io/windows_x86_64_msvc/0.48.0 \
Identification only by the plain crate name makes the sha256sum
ambiguous
| SRC_URI[windows_x86_64_msvc.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
| SRC_URI[windows_x86_64_msvc.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
and requires lot of manual work to fix the SRC_URI list.
Making the 'name' property unique by appending the version allows
direct copy & paste of reported sha256sum errors to complete the
crates list.
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/fetch2/crate.py | 2 | ||||
-rw-r--r-- | lib/bb/tests/fetch.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/bb/fetch2/crate.py b/lib/bb/fetch2/crate.py index 590dc9c12..a7021e5b3 100644 --- a/lib/bb/fetch2/crate.py +++ b/lib/bb/fetch2/crate.py @@ -72,7 +72,7 @@ class Crate(Wget): ud.url = "https://%s/%s/%s/download" % (host, name, version) ud.parm['downloadfilename'] = "%s-%s.crate" % (name, version) if 'name' not in ud.parm: - ud.parm['name'] = name + ud.parm['name'] = '%s-%s' % (name, version) logger.debug2("Fetching %s to %s" % (ud.url, ud.parm['downloadfilename'])) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index da6716890..6ef0836f2 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -2380,7 +2380,7 @@ class CrateTest(FetcherTest): ud = fetcher.ud[fetcher.urls[0]] self.assertIn("name", ud.parm) - self.assertEqual(ud.parm["name"], "glob") + self.assertEqual(ud.parm["name"], "glob-0.2.11") self.assertIn("downloadfilename", ud.parm) self.assertEqual(ud.parm["downloadfilename"], "glob-0.2.11.crate") @@ -2428,13 +2428,13 @@ class CrateTest(FetcherTest): ud = fetcher.ud[fetcher.urls[0]] self.assertIn("name", ud.parm) - self.assertEqual(ud.parm["name"], "glob") + self.assertEqual(ud.parm["name"], "glob-0.2.11") self.assertIn("downloadfilename", ud.parm) self.assertEqual(ud.parm["downloadfilename"], "glob-0.2.11.crate") ud = fetcher.ud[fetcher.urls[1]] self.assertIn("name", ud.parm) - self.assertEqual(ud.parm["name"], "time") + self.assertEqual(ud.parm["name"], "time-0.1.35") self.assertIn("downloadfilename", ud.parm) self.assertEqual(ud.parm["downloadfilename"], "time-0.1.35.crate") @@ -2451,7 +2451,7 @@ class CrateTest(FetcherTest): def test_crate_incorrect_cksum(self): uri = "crate://crates.io/aho-corasick/0.7.20" self.d.setVar('SRC_URI', uri) - self.d.setVarFlag("SRC_URI", "aho-corasick.sha256sum", hashlib.sha256("Invalid".encode("utf-8")).hexdigest()) + self.d.setVarFlag("SRC_URI", "aho-corasick-0.7.20.sha256sum", hashlib.sha256("Invalid".encode("utf-8")).hexdigest()) uris = self.d.getVar('SRC_URI').split() |