recipetool: create: hide missing npm error when called from devtool

If devtool is called with a URL to a source repository containing a
node.js module, we don't know that until recipetool has fetched it, and
due to the structure of the code we have to exit with a special code in
order to let devtool know it needs to build nodejs-native. We also want
to suppress the error message that recipetool would normally print under
these circumstances; there is already a mechanism for this but it wasn't
operative in the case where we're pointed to a source repository rather
than an npm:// URL, so create some plumbing so that we know to hide the
message.

(From OE-Core rev: 0c2d0fbb1c6c5b82183799eb7ef80074f86bcfc4)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2017-04-12 22:41:29 +12:00 committed by Richard Purdie
parent 48f8d1201a
commit 40d1771944
2 changed files with 5 additions and 1 deletions

View File

@ -59,6 +59,9 @@ class RecipeHandler(object):
recipecmakefilemap = {}
recipebinmap = {}
def __init__(self):
self._devtool = False
@staticmethod
def load_libmap(d):
'''Load library->recipe mapping'''
@ -622,6 +625,7 @@ def create_recipe(args):
handlers.sort(key=lambda item: (item[1], -item[2]), reverse=True)
for handler, priority, _ in handlers:
logger.debug('Handler: %s (priority %d)' % (handler.__class__.__name__, priority))
setattr(handler, '_devtool', args.devtool)
handlers = [item[0] for item in handlers]
# Apply the handlers

View File

@ -189,7 +189,7 @@ class NpmRecipeHandler(RecipeHandler):
files = RecipeHandler.checkfiles(srctree, ['package.json'])
if files:
d = bb.data.createCopy(tinfoil.config_data)
npm_bindir = check_npm(tinfoil)
npm_bindir = check_npm(tinfoil, self._devtool)
d.prependVar('PATH', '%s:' % npm_bindir)
data = read_package_json(files[0])