From 2f40a874248facead72b06d4ffb8c1d4da2dbcd5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 26 Feb 2018 14:49:55 +1300 Subject: 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 (From OE-Core rev: 56e04260d64de9c5b83893d97cf41b7ea9a45878) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/devtool | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/devtool') 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] -- cgit v1.2.3-54-g00ecf