diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/recipetool/create_npm.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index e667a4d19b..25e7ddb472 100644 --- a/scripts/lib/recipetool/create_npm.py +++ b/scripts/lib/recipetool/create_npm.py | |||
@@ -134,11 +134,10 @@ class NpmRecipeHandler(RecipeHandler): | |||
134 | licfiles.append(os.path.relpath(readme, srctree)) | 134 | licfiles.append(os.path.relpath(readme, srctree)) |
135 | 135 | ||
136 | # Handle the dependencies | 136 | # Handle the dependencies |
137 | def _handle_dependency(name, params, deptree): | 137 | def _handle_dependency(name, params, destdir): |
138 | deptree = destdir.split('node_modules/') | ||
138 | suffix = "-".join([npm_package(dep) for dep in deptree]) | 139 | suffix = "-".join([npm_package(dep) for dep in deptree]) |
139 | destdirs = [os.path.join("node_modules", dep) for dep in deptree] | 140 | packages["${PN}" + suffix] = destdir |
140 | destdir = os.path.join(*destdirs) | ||
141 | packages["${PN}-" + suffix] = destdir | ||
142 | _licfiles_append_fallback_readme_files(destdir) | 141 | _licfiles_append_fallback_readme_files(destdir) |
143 | 142 | ||
144 | with open(shrinkwrap_file, "r") as f: | 143 | with open(shrinkwrap_file, "r") as f: |
@@ -234,7 +233,7 @@ class NpmRecipeHandler(RecipeHandler): | |||
234 | value = origvalue.replace("version=" + data["version"], "version=${PV}") | 233 | value = origvalue.replace("version=" + data["version"], "version=${PV}") |
235 | value = value.replace("version=latest", "version=${PV}") | 234 | value = value.replace("version=latest", "version=${PV}") |
236 | values = [line.strip() for line in value.strip('\n').splitlines()] | 235 | values = [line.strip() for line in value.strip('\n').splitlines()] |
237 | if "dependencies" in shrinkwrap: | 236 | if "dependencies" in shrinkwrap.get("packages", {}).get("", {}): |
238 | values.append(url_recipe) | 237 | values.append(url_recipe) |
239 | return values, None, 4, False | 238 | return values, None, 4, False |
240 | 239 | ||