diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 3 | ||||
| -rw-r--r-- | scripts/lib/recipetool/create.py | 23 |
2 files changed, 26 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 741f0ea91b..7ef0ab8c64 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -139,6 +139,8 @@ def add(args, config, basepath, workspace): extracmdopts += ' -V %s' % args.version if args.binary: extracmdopts += ' -b' + if args.also_native: + extracmdopts += ' --also-native' tempdir = tempfile.mkdtemp(prefix='devtool') try: @@ -1307,6 +1309,7 @@ def register_commands(subparsers, context): parser_add.add_argument('--version', '-V', help='Version to use within recipe (PV)') parser_add.add_argument('--no-git', '-g', help='If fetching source, do not set up source tree as a git repository', action="store_true") parser_add.add_argument('--binary', '-b', help='Treat the source tree as something that should be installed verbatim (no compilation, same directory structure). Useful with binary packages e.g. RPMs.', action='store_true') + parser_add.add_argument('--also-native', help='Also add native variant (i.e. support building recipe for the build host as well as the target machine)', action='store_true') parser_add.set_defaults(func=add) parser_modify = subparsers.add_parser('modify', help='Modify the source for an existing recipe', diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 775be42c11..4f95d7e3ae 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -252,8 +252,14 @@ def create_recipe(args): if args.name: pn = args.name if args.name.endswith('-native'): + if args.also_native: + logger.error('--also-native cannot be specified for a recipe named *-native (*-native denotes a recipe that is already only for native) - either remove the -native suffix from the name or drop --also-native') + sys.exit(1) classes.append('native') elif args.name.startswith('nativesdk-'): + if args.also_native: + logger.error('--also-native cannot be specified for a recipe named nativesdk-* (nativesdk-* denotes a recipe that is already only for nativesdk)') + sys.exit(1) classes.append('nativesdk') if pv and pv not in 'git svn hg'.split(): @@ -393,6 +399,22 @@ def create_recipe(args): line = re.sub('"[^+]*\+', '"%s+' % realpv, line) lines_before.append(line) + if args.also_native: + lines = lines_after + lines_after = [] + bbclassextend = None + for line in lines: + if line.startswith('BBCLASSEXTEND ='): + splitval = line.split('"') + if len(splitval) > 1: + bbclassextend = splitval[1].split() + if not 'native' in bbclassextend: + bbclassextend.insert(0, 'native') + line = 'BBCLASSEXTEND = "%s"' % ' '.join(bbclassextend) + lines_after.append(line) + if not bbclassextend: + lines_after.append('BBCLASSEXTEND = "native"') + outlines = [] outlines.extend(lines_before) if classes: @@ -591,5 +613,6 @@ def register_commands(subparsers): parser_create.add_argument('-N', '--name', help='Name to use within recipe (PN)') parser_create.add_argument('-V', '--version', help='Version to use within recipe (PV)') parser_create.add_argument('-b', '--binary', help='Treat the source tree as something that should be installed verbatim (no compilation, same directory structure)', action='store_true') + parser_create.add_argument('--also-native', help='Also add native variant (i.e. support building recipe for the build host as well as the target machine)', action='store_true') parser_create.set_defaults(func=create_recipe) |