mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 18:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

npm.bbclass: make shrinkwrap file optional

Browse Source 
Some packages don't have shrinkwrap file which
means no npmsw uri is provided in the recipe.

(From OE-Core rev: 47760b0d7d66b2b68ee197d359f0b7b17374d742)

Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kamel Bouhara
2021-01-14 08:12:34 +01:00
committed by Richard Purdie
parent a2ca184abb
commit 8b0884569f
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/classes/npm.bbclass
View File

@@ -130,11 +130,17 @@ python npm_do_configure() {
cached_manifest.pop("dependencies", None) cached_manifest.pop("dependencies", None)
cached_manifest.pop("devDependencies", None) cached_manifest.pop("devDependencies", None)
with open(orig_shrinkwrap_file, "r") as f: has_shrinkwrap_file = True
orig_shrinkwrap = json.load(f)
cached_shrinkwrap = copy.deepcopy(orig_shrinkwrap) try:
cached_shrinkwrap.pop("dependencies", None) with open(orig_shrinkwrap_file, "r") as f:
orig_shrinkwrap = json.load(f)
except IOError:
has_shrinkwrap_file = False
if has_shrinkwrap_file:
cached_shrinkwrap = copy.deepcopy(orig_shrinkwrap)
cached_shrinkwrap.pop("dependencies", None)
# Manage the dependencies # Manage the dependencies
progress = OutOfProgressHandler(d, r"^(\d+)/(\d+)$") progress = OutOfProgressHandler(d, r"^(\d+)/(\d+)$")
@@ -165,8 +171,10 @@ python npm_do_configure() {
progress.write("%d/%d" % (progress_done, progress_total)) progress.write("%d/%d" % (progress_done, progress_total))
dev = bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False) dev = bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False)
foreach_dependencies(orig_shrinkwrap, _count_dependency, dev)
foreach_dependencies(orig_shrinkwrap, _cache_dependency, dev) if has_shrinkwrap_file:
foreach_dependencies(orig_shrinkwrap, _count_dependency, dev)
foreach_dependencies(orig_shrinkwrap, _cache_dependency, dev)
# Configure the main package # Configure the main package
with tempfile.TemporaryDirectory() as tmpdir: with tempfile.TemporaryDirectory() as tmpdir:
@@ -181,16 +189,19 @@ python npm_do_configure() {
cached_manifest[depkey] = {} cached_manifest[depkey] = {}
cached_manifest[depkey][name] = version cached_manifest[depkey][name] = version
_update_manifest("dependencies") if has_shrinkwrap_file:
_update_manifest("dependencies")
if dev: if dev:
_update_manifest("devDependencies") if has_shrinkwrap_file:
_update_manifest("devDependencies")
with open(cached_manifest_file, "w") as f: with open(cached_manifest_file, "w") as f:
json.dump(cached_manifest, f, indent=2) json.dump(cached_manifest, f, indent=2)
with open(cached_shrinkwrap_file, "w") as f: if has_shrinkwrap_file:
json.dump(cached_shrinkwrap, f, indent=2) with open(cached_shrinkwrap_file, "w") as f:
json.dump(cached_shrinkwrap, f, indent=2)
} }
python npm_do_compile() { python npm_do_compile() {