diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-04-12 22:41:27 +1200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-13 10:54:10 +0100 |
commit | bb8f141d0c2c668c4c98afe7760a3084756c92b9 (patch) | |
tree | b75f31b6be5a0b4596deec63fadb75637f6a077c /scripts/lib/devtool/standard.py | |
parent | 0440cbccda83f34232bff9b450a2a45eda7ff596 (diff) | |
download | poky-bb8f141d0c2c668c4c98afe7760a3084756c92b9.tar.gz |
devtool: add: fix node.js/npm handling with recipe specific sysroots
The change over to recipe specific sysroots means that we can no longer
get a known location simply from configuration for the npm binary - we
need to get the recipe sysroot for nodejs-native, look there for npm if
we need to check it's present, and add that to PATH when calling out to
npm. Unfortunately this means anywhere we need to get that path we have
to have parsed all recipes, otherwise we have no reliable way of
resolving nodejs-native. Thus we have to change recipetool create to
always parse all recipes (the structure of the code does not allow us to
do this conditionally).
In the worst case, if npm hasn't already been added to its own sysroot
and we are fetching from a source repository rather than an npm
registry, this gets a bit ugly because we end up parsing recipes three
times:
1) recipetool startup, which then fetches the code and determines it's
a node.js module, finds that npm isn't available and then exits with
a specific error to tell devtool it needs to build npm
2) when we invoke bitbake -c addto_recipe_sysroot nodejs-native
3) when we re-invoke recipetool
This code is badly in need of refactoring, but now is unfortunately not
the time to do that, so we're going to have to live with this ugliness
for now.
Fixes [YOCTO #10992].
(From OE-Core rev: acfdbd796c99882b8586023c8c6b848716105c8d)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index ffca2c9ec4..73e629ca6f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -165,7 +165,7 @@ def add(args, config, basepath, workspace): | |||
165 | # inside recipetool since recipetool keeps tinfoil active | 165 | # inside recipetool since recipetool keeps tinfoil active |
166 | # with references to it throughout the code, so we have | 166 | # with references to it throughout the code, so we have |
167 | # to exit out and come back here to do it. | 167 | # to exit out and come back here to do it. |
168 | ensure_npm(config, basepath, args.fixed_setup) | 168 | ensure_npm(config, basepath, args.fixed_setup, check_exists=False) |
169 | logger.info('Re-running recipe creation process after building nodejs') | 169 | logger.info('Re-running recipe creation process after building nodejs') |
170 | continue | 170 | continue |
171 | elif e.exitcode == 15: | 171 | elif e.exitcode == 15: |