diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 96b271c2d6..1dcf7cdf07 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -111,7 +111,7 @@ def add(args, config, basepath, workspace): | |||
111 | (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) | 111 | (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) |
112 | initial_rev = stdout.rstrip() | 112 | initial_rev = stdout.rstrip() |
113 | 113 | ||
114 | tinfoil = setup_tinfoil(config_only=True) | 114 | tinfoil = setup_tinfoil(config_only=True, basepath=basepath) |
115 | rd = oe.recipeutils.parse_recipe(recipefile, None, tinfoil.config_data) | 115 | rd = oe.recipeutils.parse_recipe(recipefile, None, tinfoil.config_data) |
116 | if not rd: | 116 | if not rd: |
117 | return 1 | 117 | return 1 |
@@ -231,7 +231,7 @@ class BbTaskExecutor(object): | |||
231 | def _prep_extract_operation(config, basepath, recipename): | 231 | def _prep_extract_operation(config, basepath, recipename): |
232 | """HACK: Ugly workaround for making sure that requirements are met when | 232 | """HACK: Ugly workaround for making sure that requirements are met when |
233 | trying to extract a package. Returns the tinfoil instance to be used.""" | 233 | trying to extract a package. Returns the tinfoil instance to be used.""" |
234 | tinfoil = setup_tinfoil() | 234 | tinfoil = setup_tinfoil(basepath=basepath) |
235 | rd = parse_recipe(config, tinfoil, recipename, True) | 235 | rd = parse_recipe(config, tinfoil, recipename, True) |
236 | 236 | ||
237 | if bb.data.inherits_class('kernel-yocto', rd): | 237 | if bb.data.inherits_class('kernel-yocto', rd): |
@@ -239,7 +239,7 @@ def _prep_extract_operation(config, basepath, recipename): | |||
239 | try: | 239 | try: |
240 | stdout, _ = exec_build_env_command(config.init_path, basepath, | 240 | stdout, _ = exec_build_env_command(config.init_path, basepath, |
241 | 'bitbake kern-tools-native') | 241 | 'bitbake kern-tools-native') |
242 | tinfoil = setup_tinfoil() | 242 | tinfoil = setup_tinfoil(basepath=basepath) |
243 | except bb.process.ExecutionError as err: | 243 | except bb.process.ExecutionError as err: |
244 | raise DevtoolError("Failed to build kern-tools-native:\n%s" % | 244 | raise DevtoolError("Failed to build kern-tools-native:\n%s" % |
245 | err.stdout) | 245 | err.stdout) |
@@ -443,7 +443,7 @@ def modify(args, config, basepath, workspace): | |||
443 | if args.extract: | 443 | if args.extract: |
444 | tinfoil = _prep_extract_operation(config, basepath, args.recipename) | 444 | tinfoil = _prep_extract_operation(config, basepath, args.recipename) |
445 | else: | 445 | else: |
446 | tinfoil = setup_tinfoil() | 446 | tinfoil = setup_tinfoil(basepath=basepath) |
447 | 447 | ||
448 | rd = parse_recipe(config, tinfoil, args.recipename, True) | 448 | rd = parse_recipe(config, tinfoil, args.recipename, True) |
449 | if not rd: | 449 | if not rd: |
@@ -797,7 +797,7 @@ def update_recipe(args, config, basepath, workspace): | |||
797 | raise DevtoolError('conf/layer.conf not found in bbappend ' | 797 | raise DevtoolError('conf/layer.conf not found in bbappend ' |
798 | 'destination layer "%s"' % args.append) | 798 | 'destination layer "%s"' % args.append) |
799 | 799 | ||
800 | tinfoil = setup_tinfoil() | 800 | tinfoil = setup_tinfoil(basepath=basepath) |
801 | 801 | ||
802 | rd = parse_recipe(config, tinfoil, args.recipename, True) | 802 | rd = parse_recipe(config, tinfoil, args.recipename, True) |
803 | if not rd: | 803 | if not rd: |