summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorStefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>2024-12-09 11:31:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-20 16:18:59 +0000
commit02f8ea68657c159486940be9d59391745c517858 (patch)
treecb78f13bc73b9c81eedb45dfdb540c288fc12363 /bitbake
parent527e4a79580c017795bee234664bdd1040e38ec9 (diff)
downloadpoky-02f8ea68657c159486940be9d59391745c517858.tar.gz
bitbake: fetch2: npmsw: ignore bundled dependencies in packages
The npm package lock and shrinkwrap file list bundled dependencies which are supplied together with the parent dependency. The flag depends on the lock file version. Add the missing `inBundle` flag to packages list processing. (Bitbake rev: 042d7121ddc93c18306bf03d26ea774f66379a90) Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/npmsw.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/fetch2/npmsw.py b/bitbake/lib/bb/fetch2/npmsw.py
index a5fa598deb..558c9a2b07 100644
--- a/bitbake/lib/bb/fetch2/npmsw.py
+++ b/bitbake/lib/bb/fetch2/npmsw.py
@@ -66,6 +66,8 @@ def foreach_dependencies(shrinkwrap, callback=None, dev=False):
66 package_infos = packages.get(package, {}) 66 package_infos = packages.get(package, {})
67 if dev == False and package_infos.get("dev", False): 67 if dev == False and package_infos.get("dev", False):
68 continue 68 continue
69 elif package_infos.get("inBundle", False):
70 continue
69 callback(name, package_infos, package) 71 callback(name, package_infos, package)
70 else: 72 else:
71 _walk_deps(shrinkwrap.get("dependencies", {}), []) 73 _walk_deps(shrinkwrap.get("dependencies", {}), [])