summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaewon Lee <jaewon.lee@xilinx.com>2019-06-13 16:29:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-21 21:52:59 +0100
commit8f29534ccbd1ca2659e041989dda8eae3c72570a (patch)
tree548d16fc097e8149f5c6a553a238cbaed519b690
parentfe856ba7df9ccc05ebb9715d3b58d08949884ad1 (diff)
downloadpoky-8f29534ccbd1ca2659e041989dda8eae3c72570a.tar.gz
devtool: build: Also run deploy for devtool build if applicable
Right now `devtool build` runs populate_sysroot and packagedata tasks. Adding deploy to this list, if the recipe has the deploy task, so that the newly built artifacts are available in the deploy directory. Applicable only for packages with deploy task, such as kernel. [YOCTO#13382] (From OE-Core rev: b38a1328f0c7bc4b4102a05daee4058fd3214489) Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/build.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/scripts/lib/devtool/build.py b/scripts/lib/devtool/build.py
index 7543398d96..935ffab46c 100644
--- a/scripts/lib/devtool/build.py
+++ b/scripts/lib/devtool/build.py
@@ -11,7 +11,8 @@ import bb
11import logging 11import logging
12import argparse 12import argparse
13import tempfile 13import tempfile
14from devtool import exec_build_env_command, check_workspace_recipe, DevtoolError 14from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, DevtoolError
15from devtool import parse_recipe
15 16
16logger = logging.getLogger('devtool') 17logger = logging.getLogger('devtool')
17 18
@@ -43,12 +44,22 @@ def _get_build_tasks(config):
43def build(args, config, basepath, workspace): 44def build(args, config, basepath, workspace):
44 """Entry point for the devtool 'build' subcommand""" 45 """Entry point for the devtool 'build' subcommand"""
45 workspacepn = check_workspace_recipe(workspace, args.recipename, bbclassextend=True) 46 workspacepn = check_workspace_recipe(workspace, args.recipename, bbclassextend=True)
47 tinfoil = setup_tinfoil(config_only=False, basepath=basepath)
48 try:
49 rd = parse_recipe(config, tinfoil, args.recipename, appends=True, filter_workspace=False)
50 if not rd:
51 return 1
52 deploytask = 'do_deploy' in rd.getVar('__BBTASKS')
53 finally:
54 tinfoil.shutdown()
46 55
47 if args.clean: 56 if args.clean:
48 # use clean instead of cleansstate to avoid messing things up in eSDK 57 # use clean instead of cleansstate to avoid messing things up in eSDK
49 build_tasks = ['do_clean'] 58 build_tasks = ['do_clean']
50 else: 59 else:
51 build_tasks = _get_build_tasks(config) 60 build_tasks = _get_build_tasks(config)
61 if deploytask:
62 build_tasks.append('do_deploy')
52 63
53 bbappend = workspace[workspacepn]['bbappend'] 64 bbappend = workspace[workspacepn]['bbappend']
54 if args.disable_parallel_make: 65 if args.disable_parallel_make: