diff options
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/recipetool/create.py | 4 | ||||
| -rw-r--r-- | scripts/lib/recipetool/create_npm.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 439dca0fcc..5af58a12f7 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
| @@ -59,6 +59,9 @@ class RecipeHandler(object): | |||
| 59 | recipecmakefilemap = {} | 59 | recipecmakefilemap = {} |
| 60 | recipebinmap = {} | 60 | recipebinmap = {} |
| 61 | 61 | ||
| 62 | def __init__(self): | ||
| 63 | self._devtool = False | ||
| 64 | |||
| 62 | @staticmethod | 65 | @staticmethod |
| 63 | def load_libmap(d): | 66 | def load_libmap(d): |
| 64 | '''Load library->recipe mapping''' | 67 | '''Load library->recipe mapping''' |
| @@ -622,6 +625,7 @@ def create_recipe(args): | |||
| 622 | handlers.sort(key=lambda item: (item[1], -item[2]), reverse=True) | 625 | handlers.sort(key=lambda item: (item[1], -item[2]), reverse=True) |
| 623 | for handler, priority, _ in handlers: | 626 | for handler, priority, _ in handlers: |
| 624 | logger.debug('Handler: %s (priority %d)' % (handler.__class__.__name__, priority)) | 627 | logger.debug('Handler: %s (priority %d)' % (handler.__class__.__name__, priority)) |
| 628 | setattr(handler, '_devtool', args.devtool) | ||
| 625 | handlers = [item[0] for item in handlers] | 629 | handlers = [item[0] for item in handlers] |
| 626 | 630 | ||
| 627 | # Apply the handlers | 631 | # Apply the handlers |
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index a79a9afbb1..cb8f338b8b 100644 --- a/scripts/lib/recipetool/create_npm.py +++ b/scripts/lib/recipetool/create_npm.py | |||
| @@ -189,7 +189,7 @@ class NpmRecipeHandler(RecipeHandler): | |||
| 189 | files = RecipeHandler.checkfiles(srctree, ['package.json']) | 189 | files = RecipeHandler.checkfiles(srctree, ['package.json']) |
| 190 | if files: | 190 | if files: |
| 191 | d = bb.data.createCopy(tinfoil.config_data) | 191 | d = bb.data.createCopy(tinfoil.config_data) |
| 192 | npm_bindir = check_npm(tinfoil) | 192 | npm_bindir = check_npm(tinfoil, self._devtool) |
| 193 | d.prependVar('PATH', '%s:' % npm_bindir) | 193 | d.prependVar('PATH', '%s:' % npm_bindir) |
| 194 | 194 | ||
| 195 | data = read_package_json(files[0]) | 195 | data = read_package_json(files[0]) |
