From: Ross Burton Date: Wed, 11 Dec 2024 12:08:47 +0000 (+0000) Subject: scripts/devtool: use bb.util.listtasks instead of __BBTASKS X-Git-Tag: yocto-5.2~1017 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d31a7718c16bd26efd6e174cb5e97fb088aad4bd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git scripts/devtool: use bb.util.listtasks instead of __BBTASKS Don't access private variables, instead use the new bb.build.listtasks() function (from bitbake 185c4b) Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand --- diff --git a/scripts/lib/devtool/build.py b/scripts/lib/devtool/build.py index 935ffab46c5..0b2c3d33dc1 100644 --- a/scripts/lib/devtool/build.py +++ b/scripts/lib/devtool/build.py @@ -49,7 +49,7 @@ def build(args, config, basepath, workspace): rd = parse_recipe(config, tinfoil, args.recipename, appends=True, filter_workspace=False) if not rd: return 1 - deploytask = 'do_deploy' in rd.getVar('__BBTASKS') + deploytask = 'do_deploy' in bb.build.listtasks(rd) finally: tinfoil.shutdown() diff --git a/scripts/lib/devtool/utilcmds.py b/scripts/lib/devtool/utilcmds.py index 964817766b7..bf39f71b118 100644 --- a/scripts/lib/devtool/utilcmds.py +++ b/scripts/lib/devtool/utilcmds.py @@ -64,7 +64,7 @@ def configure_help(args, config, basepath, workspace): b = rd.getVar('B') s = rd.getVar('S') configurescript = os.path.join(s, 'configure') - confdisabled = 'noexec' in rd.getVarFlags('do_configure') or 'do_configure' not in (rd.getVar('__BBTASKS', False) or []) + confdisabled = 'noexec' in rd.getVarFlags('do_configure') or 'do_configure' not in (bb.build.listtasks(rd)) configureopts = oe.utils.squashspaces(rd.getVar('CONFIGUREOPTS') or '') extra_oeconf = oe.utils.squashspaces(rd.getVar('EXTRA_OECONF') or '') extra_oecmake = oe.utils.squashspaces(rd.getVar('EXTRA_OECMAKE') or '')