diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-12-22 17:03:13 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-28 09:25:14 +0000 |
| commit | 95a234e7b3b2d7002aada4e65aa44ac6c8af815f (patch) | |
| tree | 9571206ed14badf2b2ed1d0ffb1dfa694fede1dc /scripts/lib | |
| parent | e11673960f039e06d03cd795c160d19d7996b91f (diff) | |
| download | poky-95a234e7b3b2d7002aada4e65aa44ac6c8af815f.tar.gz | |
devtool: status: list recipe file within workspace if one exists
If a recipe in the workspace actually exists as a file within the
workspace (e.g. after doing "devtool add" or "devtool upgrade") then
show the path to the recipe file on the status line for the recipe.
(From OE-Core rev: 29833828a90c8433af3b231b50e99cd97edf19ff)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index c710c16635..ed9e793d4a 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
| @@ -26,6 +26,7 @@ import argparse | |||
| 26 | import argparse_oe | 26 | import argparse_oe |
| 27 | import scriptutils | 27 | import scriptutils |
| 28 | import errno | 28 | import errno |
| 29 | import glob | ||
| 29 | from collections import OrderedDict | 30 | from collections import OrderedDict |
| 30 | from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, DevtoolError | 31 | from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, DevtoolError |
| 31 | from devtool import parse_recipe | 32 | from devtool import parse_recipe |
| @@ -1168,7 +1169,16 @@ def status(args, config, basepath, workspace): | |||
| 1168 | """Entry point for the devtool 'status' subcommand""" | 1169 | """Entry point for the devtool 'status' subcommand""" |
| 1169 | if workspace: | 1170 | if workspace: |
| 1170 | for recipe, value in workspace.iteritems(): | 1171 | for recipe, value in workspace.iteritems(): |
| 1171 | print("%s: %s" % (recipe, value['srctree'])) | 1172 | bbfile = os.path.basename(value['bbappend']).replace('.bbappend', '.bb').replace('%', '*') |
| 1173 | recipefile = glob.glob(os.path.join(config.workspace_path, | ||
| 1174 | 'recipes', | ||
| 1175 | recipe, | ||
| 1176 | bbfile)) | ||
| 1177 | if recipefile: | ||
| 1178 | recipestr = ' (%s)' % recipefile[0] | ||
| 1179 | else: | ||
| 1180 | recipestr = '' | ||
| 1181 | print("%s: %s%s" % (recipe, value['srctree'], recipestr)) | ||
| 1172 | else: | 1182 | else: |
| 1173 | logger.info('No recipes currently in your workspace - you can use "devtool modify" to work on an existing recipe or "devtool add" to add a new one') | 1183 | logger.info('No recipes currently in your workspace - you can use "devtool modify" to work on an existing recipe or "devtool add" to add a new one') |
| 1174 | return 0 | 1184 | return 0 |
