summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-10-31 16:59:44 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-07 11:04:22 +0000
commit452a1133ddadfb0750e930843d0e284185fca17c (patch)
tree192914886c3b96f38ed0a0ccec5d0257ecbe2e46 /scripts/lib/devtool
parent1655d55764eb0241b71217810500fcf1d4519a1c (diff)
downloadpoky-452a1133ddadfb0750e930843d0e284185fca17c.tar.gz
devtool: add: show recipetool create output
When running devtool add, instead of hiding the recipetool create output, change it so that it's appropriate to show in the devtool context and show it in real-time. This means that you get status output such as when a URL is being fetched (though currently no progress information.) recipetool create now has a hidden --devtool option to enable this display mode. (From OE-Core rev: 219aec8803de4ef04c514c87ecfb15359c9424a6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-rw-r--r--scripts/lib/devtool/standard.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 4eff6f878b..8dfd538332 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -155,7 +155,7 @@ def add(args, config, basepath, workspace):
155 try: 155 try:
156 while True: 156 while True:
157 try: 157 try:
158 stdout, _ = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create -o %s "%s" %s' % (color, tempdir, source, extracmdopts)) 158 stdout, _ = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create --devtool -o %s \'%s\' %s' % (color, tempdir, source, extracmdopts), watch=True)
159 except bb.process.ExecutionError as e: 159 except bb.process.ExecutionError as e:
160 if e.exitcode == 14: 160 if e.exitcode == 14:
161 # FIXME this is a horrible hack that is unfortunately 161 # FIXME this is a horrible hack that is unfortunately
@@ -164,11 +164,12 @@ def add(args, config, basepath, workspace):
164 # with references to it throughout the code, so we have 164 # with references to it throughout the code, so we have
165 # to exit out and come back here to do it. 165 # to exit out and come back here to do it.
166 ensure_npm(config, basepath, args.fixed_setup) 166 ensure_npm(config, basepath, args.fixed_setup)
167 logger.info('Re-running recipe creation process after building nodejs')
167 continue 168 continue
168 elif e.exitcode == 15: 169 elif e.exitcode == 15:
169 raise DevtoolError('Could not auto-determine recipe name, please specify it on the command line') 170 raise DevtoolError('Could not auto-determine recipe name, please specify it on the command line')
170 else: 171 else:
171 raise DevtoolError('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) 172 raise DevtoolError('Command \'%s\' failed' % e.command)
172 break 173 break
173 174
174 recipes = glob.glob(os.path.join(tempdir, '*.bb')) 175 recipes = glob.glob(os.path.join(tempdir, '*.bb'))