mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

npm: Use configs for npm environment and args for npm run command

Browse Source 
Use parameter configs of class NpmEnvironment and parameter args of
function run to support a common npmrc for all run calls of a single
NpmEnvironment.

(From OE-Core rev: 6490de38ba9563181653ef223224de066faf9166)

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stefan Herbrechtsmeier
2021-10-08 09:48:34 +02:00
committed by Richard Purdie
parent 9f452b4831
commit fe87ab0a6a
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/npm.bbclass
+6 -8
View File
@@ -61,8 +61,8 @@ def npm_pack(env, srcdir, workdir):
"""Run 'npm pack' on a specified directory""" """Run 'npm pack' on a specified directory"""
import shlex import shlex
cmd = "npm pack %s" % shlex.quote(srcdir) cmd = "npm pack %s" % shlex.quote(srcdir)
configs = [("ignore-scripts", "true")] args = [("ignore-scripts", "true")]
tarball = env.run(cmd, configs=configs, workdir=workdir).strip("\n") tarball = env.run(cmd, args=args, workdir=workdir).strip("\n")
return os.path.join(workdir, tarball) return os.path.join(workdir, tarball)
python npm_do_configure() { python npm_do_configure() {
@@ -228,15 +228,11 @@ python npm_do_compile() {
bb.utils.remove(d.getVar("NPM_BUILD"), recurse=True) bb.utils.remove(d.getVar("NPM_BUILD"), recurse=True)
env = NpmEnvironment(d, configs=npm_global_configs(d))
dev = bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False)
with tempfile.TemporaryDirectory() as tmpdir: with tempfile.TemporaryDirectory() as tmpdir:
args = [] args = []
configs = [] configs = npm_global_configs(d)
if dev: if bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False):
configs.append(("also", "development")) configs.append(("also", "development"))
else: else:
configs.append(("only", "production")) configs.append(("only", "production"))
@@ -254,6 +250,8 @@ python npm_do_compile() {
configs.append(("nodedir", d.getVar("NPM_NODEDIR"))) configs.append(("nodedir", d.getVar("NPM_NODEDIR")))
configs.append(("python", d.getVar("PYTHON"))) configs.append(("python", d.getVar("PYTHON")))
env = NpmEnvironment(d, configs)
# Add node-pre-gyp configuration # Add node-pre-gyp configuration
args.append(("target_arch", d.getVar("NPM_ARCH"))) args.append(("target_arch", d.getVar("NPM_ARCH")))
args.append(("build-from-source", "true")) args.append(("build-from-source", "true"))