summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/utilcmds.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/devtool/utilcmds.py')
-rw-r--r--scripts/lib/devtool/utilcmds.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/lib/devtool/utilcmds.py b/scripts/lib/devtool/utilcmds.py
index b761a80f8f..0437e6417c 100644
--- a/scripts/lib/devtool/utilcmds.py
+++ b/scripts/lib/devtool/utilcmds.py
@@ -39,7 +39,7 @@ def edit_recipe(args, config, basepath, workspace):
39 rd = parse_recipe(config, tinfoil, args.recipename, True) 39 rd = parse_recipe(config, tinfoil, args.recipename, True)
40 if not rd: 40 if not rd:
41 return 1 41 return 1
42 recipefile = rd.getVar('FILE', True) 42 recipefile = rd.getVar('FILE')
43 finally: 43 finally:
44 tinfoil.shutdown() 44 tinfoil.shutdown()
45 else: 45 else:
@@ -62,20 +62,20 @@ def configure_help(args, config, basepath, workspace):
62 rd = parse_recipe(config, tinfoil, args.recipename, appends=True, filter_workspace=False) 62 rd = parse_recipe(config, tinfoil, args.recipename, appends=True, filter_workspace=False)
63 if not rd: 63 if not rd:
64 return 1 64 return 1
65 b = rd.getVar('B', True) 65 b = rd.getVar('B')
66 s = rd.getVar('S', True) 66 s = rd.getVar('S')
67 configurescript = os.path.join(s, 'configure') 67 configurescript = os.path.join(s, 'configure')
68 confdisabled = 'noexec' in rd.getVarFlags('do_configure') or 'do_configure' not in (rd.getVar('__BBTASKS', False) or []) 68 confdisabled = 'noexec' in rd.getVarFlags('do_configure') or 'do_configure' not in (rd.getVar('__BBTASKS', False) or [])
69 configureopts = oe.utils.squashspaces(rd.getVar('CONFIGUREOPTS', True) or '') 69 configureopts = oe.utils.squashspaces(rd.getVar('CONFIGUREOPTS') or '')
70 extra_oeconf = oe.utils.squashspaces(rd.getVar('EXTRA_OECONF', True) or '') 70 extra_oeconf = oe.utils.squashspaces(rd.getVar('EXTRA_OECONF') or '')
71 extra_oecmake = oe.utils.squashspaces(rd.getVar('EXTRA_OECMAKE', True) or '') 71 extra_oecmake = oe.utils.squashspaces(rd.getVar('EXTRA_OECMAKE') or '')
72 do_configure = rd.getVar('do_configure', True) or '' 72 do_configure = rd.getVar('do_configure') or ''
73 do_configure_noexpand = rd.getVar('do_configure', False) or '' 73 do_configure_noexpand = rd.getVar('do_configure', False) or ''
74 packageconfig = rd.getVarFlags('PACKAGECONFIG') or [] 74 packageconfig = rd.getVarFlags('PACKAGECONFIG') or []
75 autotools = bb.data.inherits_class('autotools', rd) and ('oe_runconf' in do_configure or 'autotools_do_configure' in do_configure) 75 autotools = bb.data.inherits_class('autotools', rd) and ('oe_runconf' in do_configure or 'autotools_do_configure' in do_configure)
76 cmake = bb.data.inherits_class('cmake', rd) and ('cmake_do_configure' in do_configure) 76 cmake = bb.data.inherits_class('cmake', rd) and ('cmake_do_configure' in do_configure)
77 cmake_do_configure = rd.getVar('cmake_do_configure', True) 77 cmake_do_configure = rd.getVar('cmake_do_configure')
78 pn = rd.getVar('PN', True) 78 pn = rd.getVar('PN')
79 finally: 79 finally:
80 tinfoil.shutdown() 80 tinfoil.shutdown()
81 81