From: Enrico Scholz Date: Thu, 19 May 2022 10:05:53 +0000 (+0200) Subject: npm: take 'version' directly from 'package.json' X-Git-Tag: uninative-3.7~486 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f553e528e76f7e3925ed1c0950d96e73aec37da9;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git npm: take 'version' directly from 'package.json' We know the content of 'package.json' from earlier patches; there is no need to parse the tarball name to extract the version. Signed-off-by: Enrico Scholz Signed-off-by: Richard Purdie --- diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index 73483cb994d..c180804e0e9 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -126,11 +126,6 @@ python npm_do_configure() { sha512 = bb.utils.sha512_file(tarball) return "sha512-" + base64.b64encode(bytes.fromhex(sha512)).decode() - def _npm_version(tarball): - """Return the version of a specified tarball""" - regex = r"-(\d+\.\d+\.\d+(-.*)?(\+.*)?)\.tgz" - return re.search(regex, tarball).group(1) - def _npmsw_dependency_dict(orig, deptree): """ Return the sub dictionary in the 'orig' dictionary corresponding to the @@ -191,7 +186,7 @@ python npm_do_configure() { _npm_cache_add(tarball) # Add its signature to the cached shrinkwrap dep = _npmsw_dependency_dict(cached_shrinkwrap, deptree) - dep["version"] = _npm_version(tarball) + dep["version"] = pkg['version'] dep["integrity"] = _npm_integrity(tarball) if params.get("dev", False): dep["dev"] = True