Переглянути джерело

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)

(From OE-Core rev: d31a7718c16bd26efd6e174cb5e97fb088aad4bd)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ross Burton 5 місяців тому
батько
коміт
30ffe589e4
2 змінених файлів з 2 додано та 2 видалено
  1. 1 1
      scripts/lib/devtool/build.py
  2. 1 1
      scripts/lib/devtool/utilcmds.py

+ 1 - 1
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()
 

+ 1 - 1
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 '')