summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-04-27 10:53:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-28 09:44:14 +0100
commit66dd73d1d163b0530f4f13b391ae9245cfcd1ed1 (patch)
tree38fe58e494f846a9953a19e847709007dc96a182 /scripts/lib/devtool
parenteabd7359d164754b17dddedd21d95e33bd75b39f (diff)
downloadpoky-66dd73d1d163b0530f4f13b391ae9245cfcd1ed1.tar.gz
devtool: modify: implement --no-same-dir
This option can be used to have a separate build directory, in order to keep the srctree directory clean for packages that do not need to be built in the source directory. (From OE-Core master rev: 5cc348c0a3016e4ccc1e80d099e2e197b3b38bd2) (From OE-Core rev: a7316a4c564901b30af740ece6631a6f68355bb4) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-rw-r--r--scripts/lib/devtool/standard.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index fbac34edfd..aa30a98090 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -386,7 +386,10 @@ def modify(args, config, basepath, workspace):
386 f.write('EXTERNALSRC_pn-%s = "%s"\n' % (args.recipename, srctree)) 386 f.write('EXTERNALSRC_pn-%s = "%s"\n' % (args.recipename, srctree))
387 387
388 b_is_s = True 388 b_is_s = True
389 if args.same_dir: 389 if args.no_same_dir:
390 logger.info('using separate build directory since --no-same-dir specified')
391 b_is_s = False
392 elif args.same_dir:
390 logger.info('using source tree as build directory since --same-dir specified') 393 logger.info('using source tree as build directory since --same-dir specified')
391 elif bb.data.inherits_class('autotools-brokensep', rd): 394 elif bb.data.inherits_class('autotools-brokensep', rd):
392 logger.info('using source tree as build directory since original recipe inherits autotools-brokensep') 395 logger.info('using source tree as build directory since original recipe inherits autotools-brokensep')
@@ -664,7 +667,9 @@ def register_commands(subparsers, context):
664 parser_modify.add_argument('srctree', help='Path to external source tree') 667 parser_modify.add_argument('srctree', help='Path to external source tree')
665 parser_modify.add_argument('--wildcard', '-w', action="store_true", help='Use wildcard for unversioned bbappend') 668 parser_modify.add_argument('--wildcard', '-w', action="store_true", help='Use wildcard for unversioned bbappend')
666 parser_modify.add_argument('--extract', '-x', action="store_true", help='Extract source as well') 669 parser_modify.add_argument('--extract', '-x', action="store_true", help='Extract source as well')
667 parser_modify.add_argument('--same-dir', '-s', help='Build in same directory as source', action="store_true") 670 group = parser_modify.add_mutually_exclusive_group()
671 group.add_argument('--same-dir', '-s', help='Build in same directory as source', action="store_true")
672 group.add_argument('--no-same-dir', help='Force build in a separate build directory', action="store_true")
668 parser_modify.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (only when using -x)') 673 parser_modify.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (only when using -x)')
669 parser_modify.set_defaults(func=modify) 674 parser_modify.set_defaults(func=modify)
670 675