diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2018-02-26 14:49:55 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-01 22:09:17 +0000 |
| commit | 56e04260d64de9c5b83893d97cf41b7ea9a45878 (patch) | |
| tree | 767cbc7f6043a7566d930b1add5f709d69289f25 /scripts/devtool | |
| parent | dd3d4b0367272a5826a9a51afa26f426dd003e5d (diff) | |
| download | openembedded-core-56e04260d64de9c5b83893d97cf41b7ea9a45878.tar.gz openembedded-core-56e04260d64de9c5b83893d97cf41b7ea9a45878.tar.bz2 openembedded-core-56e04260d64de9c5b83893d97cf41b7ea9a45878.zip | |
devtool: fix poor handling of upgraded BBCLASSEXTENDed recipes
Fix two aspects of handling BBCLASSEXTENDed targets (e.g.
openssl-native) that have been run through "devtool upgrade":
* Fix recipe name not showing up in "devtool status"
* Fix "devtool reset" not deleting empty directories under the recipe
directory within the workspace, which may lead to problems if you
subsequently run "devtool upgrade" on the same target again
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/devtool')
| -rwxr-xr-x | scripts/devtool | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/devtool b/scripts/devtool index a651d8f213..b4bfbb8329 100755 --- a/scripts/devtool +++ b/scripts/devtool @@ -117,12 +117,13 @@ def read_workspace(): for line in f: res = externalsrc_re.match(line.rstrip()) if res: - pn = res.group(2) or os.path.splitext(os.path.basename(fn))[0].split('_')[0] + recipepn = os.path.splitext(os.path.basename(fn))[0].split('_')[0] + pn = res.group(2) or recipepn # Find the recipe file within the workspace, if any bbfile = os.path.basename(fn).replace('.bbappend', '.bb').replace('%', '*') recipefile = glob.glob(os.path.join(config.workspace_path, 'recipes', - pn, + recipepn, bbfile)) if recipefile: recipefile = recipefile[0] |