summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2022-05-19 12:05:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-28 12:53:55 +0100
commitd67367e389c492ae90f9021066d6a4d5ebcf68e5 (patch)
tree10487ff5542d091e2cf2c0837a8efdd3df4b9fb1
parent68b480d64ffb6750699cc8fa00d2ac0bc6a2e58a (diff)
downloadopenembedded-core-d67367e389c492ae90f9021066d6a4d5ebcf68e5.tar.gz
npm: return content of 'package.json' in 'npm_pack'
We have to read 'package.json' to calculate the name of the tarball. This content is interesting for later patches. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/npm.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index 492935a85e..73483cb994 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -86,7 +86,7 @@ def npm_pack(env, srcdir, workdir):
'.'],
check = True, cwd = srcdir)
- return tarball
+ return (tarball, j)
python npm_do_configure() {
"""
@@ -187,7 +187,7 @@ python npm_do_configure() {
with tempfile.TemporaryDirectory() as tmpdir:
# Add the dependency to the npm cache
destdir = os.path.join(d.getVar("S"), destsuffix)
- tarball = npm_pack(env, destdir, tmpdir)
+ (tarball, pkg) = npm_pack(env, destdir, tmpdir)
_npm_cache_add(tarball)
# Add its signature to the cached shrinkwrap
dep = _npmsw_dependency_dict(cached_shrinkwrap, deptree)
@@ -208,7 +208,7 @@ python npm_do_configure() {
# Configure the main package
with tempfile.TemporaryDirectory() as tmpdir:
- tarball = npm_pack(env, d.getVar("S"), tmpdir)
+ (tarball, _) = npm_pack(env, d.getVar("S"), tmpdir)
npm_unpack(tarball, d.getVar("NPM_PACKAGE"), d)
# Configure the cached manifest file and cached shrinkwrap file
@@ -282,7 +282,7 @@ python npm_do_compile() {
args.append(("build-from-source", "true"))
# Pack and install the main package
- tarball = npm_pack(env, d.getVar("NPM_PACKAGE"), tmpdir)
+ (tarball, _) = npm_pack(env, d.getVar("NPM_PACKAGE"), tmpdir)
cmd = "npm install %s %s" % (shlex.quote(tarball), d.getVar("EXTRA_OENPM"))
env.run(cmd, args=args)
}