From 66dd73d1d163b0530f4f13b391ae9245cfcd1ed1 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 27 Apr 2015 10:53:14 +0100 Subject: 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 Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'scripts/lib/devtool/standard.py') diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index fbac34e..aa30a98 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -386,7 +386,10 @@ def modify(args, config, basepath, workspace): f.write('EXTERNALSRC_pn-%s = "%s"\n' % (args.recipename, srctree)) b_is_s = True - if args.same_dir: + if args.no_same_dir: + logger.info('using separate build directory since --no-same-dir specified') + b_is_s = False + elif args.same_dir: logger.info('using source tree as build directory since --same-dir specified') elif bb.data.inherits_class('autotools-brokensep', rd): logger.info('using source tree as build directory since original recipe inherits autotools-brokensep') @@ -664,7 +667,9 @@ def register_commands(subparsers, context): parser_modify.add_argument('srctree', help='Path to external source tree') parser_modify.add_argument('--wildcard', '-w', action="store_true", help='Use wildcard for unversioned bbappend') parser_modify.add_argument('--extract', '-x', action="store_true", help='Extract source as well') - parser_modify.add_argument('--same-dir', '-s', help='Build in same directory as source', action="store_true") + group = parser_modify.add_mutually_exclusive_group() + group.add_argument('--same-dir', '-s', help='Build in same directory as source', action="store_true") + group.add_argument('--no-same-dir', help='Force build in a separate build directory', action="store_true") parser_modify.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (only when using -x)') parser_modify.set_defaults(func=modify) -- cgit v1.1