From: Stefano Tondo <stondo@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>,
Joshua Watt <JPEWhacker@gmail.com>,
Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>,
Peter Marko <peter.marko@siemens.com>,
stefano.tondo.ext@siemens.com
Subject: [PATCH 04/10] recipetool: create_npm: Remove the "@" of a scope from generated names
Date: Fri, 20 Nov 2026 14:53:35 +0100 [thread overview]
Message-ID: <20261120135342.2628228-5-stondo@gmail.com> (raw)
In-Reply-To: <20261120135342.2628228-1-stondo@gmail.com>
From: Stefano Tondo <stefano.tondo.ext@siemens.com>
Since bitbake commit 7c9573cb6, npm_package() keeps the "@" of a
scoped package. This gives unique download file names. recipetool also
uses npm_package() for the recipe name and the package names. So it
creates "@savoirfairelinux-node-server-example_1.0.0.bb", and for a
scoped dependency it writes overrides that bitbake cannot parse:
LICENSE:${PN}-@-execute = "MIT"
Remove the "@" from these names. The selftest expects the recipe name
without it.
Signed-off-by: Stefano Tondo <stefano.tondo.ext@siemens.com>
---
scripts/lib/recipetool/create_npm.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py
index 437cb91ad4..50dd45c7d2 100644
--- a/scripts/lib/recipetool/create_npm.py
+++ b/scripts/lib/recipetool/create_npm.py
@@ -23,6 +23,12 @@ logger = logging.getLogger('recipetool')
TINFOIL = None
+def npm_recipe_name(package):
+ """Get a recipe or package name from an npm package name"""
+ # npm_package() keeps the "@" of a scope for unique download file names.
+ # An override cannot have it.
+ return npm_package(package).lstrip("@").strip("-")
+
def tinfoil_init(instance):
"""Initialize tinfoil"""
global TINFOIL
@@ -147,7 +153,7 @@ class NpmRecipeHandler(RecipeHandler):
# Handle the dependencies
def _handle_dependency(name, params, destdir):
deptree = destdir.split('node_modules/')
- suffix = "-".join([npm_package(dep) for dep in deptree])
+ suffix = "-".join([npm_recipe_name(dep) for dep in deptree])
packages["${PN}" + suffix] = destdir
_get_package_licenses(destdir, "${PN}" + suffix)
@@ -171,7 +177,7 @@ class NpmRecipeHandler(RecipeHandler):
peer_deps = packages.get("", {}).get("peerDependencies", {})
for peer_dep in peer_deps:
- peer_dep_yocto_name = npm_package(peer_dep)
+ peer_dep_yocto_name = npm_recipe_name(peer_dep)
bb.warn(peer_dep + " is a peer dependencie of the actual package. " +
"Please add this peer dependencie to the RDEPENDS variable as %s and generate its recipe with devtool"
% peer_dep_yocto_name)
@@ -195,7 +201,7 @@ class NpmRecipeHandler(RecipeHandler):
if "name" not in data or "version" not in data:
return False
- extravalues["PN"] = npm_package(data["name"])
+ extravalues["PN"] = npm_recipe_name(data["name"])
extravalues["PV"] = data["version"]
if "description" in data:
--
2.56.1
next prev parent reply other threads:[~2026-11-20 13:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 13:53 [PATCH 00/10] npm: list the dependencies in SRC_URI Stefano Tondo
2026-11-20 13:53 ` [PATCH 01/10] recipetool: create_npm: Give the fallback licenses as a string Stefano Tondo
2026-11-20 13:53 ` [PATCH 02/10] recipetool: create: Get the checksum of npm packages from the registry Stefano Tondo
2026-11-20 13:53 ` [PATCH 03/10] recipetool: create_npm: Give the package fallback licenses as strings Stefano Tondo
2026-11-20 13:53 ` Stefano Tondo [this message]
2026-11-20 14:04 ` Patchtest results for [PATCH 04/10] recipetool: create_npm: Remove the "@" of a scope from generated names patchtest
2026-11-20 13:53 ` [PATCH 05/10] oeqa/selftest: recipetool: Expect the npm source in UNPACKDIR Stefano Tondo
2026-11-20 13:53 ` [PATCH 06/10] lib/oe/npm: Add SRC_URI entries for the dependencies of a shrinkwrap file Stefano Tondo
2026-11-20 13:53 ` [PATCH 07/10] npm-update-dependencies: Add a class to list the npm dependencies Stefano Tondo
2026-11-20 13:53 ` [PATCH 08/10] npm: Check that SRC_URI lists all dependencies of the shrinkwrap file Stefano Tondo
2026-11-20 13:53 ` [PATCH 09/10] recipetool: create: Clean the recipe after its tasks Stefano Tondo
2026-11-20 13:53 ` [PATCH 10/10] recipetool: create_npm: List the npm dependencies in SRC_URI Stefano Tondo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120135342.2628228-5-stondo@gmail.com \
--to=stondo@gmail.com \
--cc=JPEWhacker@gmail.com \
--cc=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=peter.marko@siemens.com \
--cc=stefan.herbrechtsmeier@weidmueller.com \
--cc=stefano.tondo.ext@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox