diff options
Diffstat (limited to 'meta/files')
-rw-r--r-- | meta/files/ext-sdk-prepare.py | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/meta/files/ext-sdk-prepare.py b/meta/files/ext-sdk-prepare.py index bf0d03336b..3b33c0f9e9 100644 --- a/meta/files/ext-sdk-prepare.py +++ b/meta/files/ext-sdk-prepare.py @@ -27,22 +27,6 @@ def exec_watch(cmd, **options): return process.returncode, buf -def check_unexpected(lines, recipes): - """Check for unexpected output lines from dry run""" - unexpected = [] - for line in lines.splitlines(): - if 'Running task' in line: - for recipe in recipes: - if recipe in line: - break - else: - line = line.split('Running', 1)[-1] - if 'do_rm_work' not in line: - unexpected.append(line.rstrip()) - elif 'Running setscene' in line: - unexpected.append(line.rstrip()) - return unexpected - def main(): if len(sys.argv) < 2: sdk_targets = [] @@ -55,44 +39,10 @@ def main(): print('Preparing SDK for %s...' % ', '.join(sdk_targets)) - ret, out = exec_watch('bitbake %s --setscene-only' % ' '.join(sdk_targets)) + ret, out = exec_watch('BB_SETSCENE_ENFORCE=1 bitbake %s' % ' '.join(sdk_targets)) if ret: return ret - targetlist = [] - for target in sdk_targets: - if ':' in target: - target = target.split(':')[0] - if not target in targetlist: - targetlist.append(target) - - recipes = [] - for target in targetlist: - try: - out = subprocess.check_output(('bitbake -e %s' % target).split(), stderr=subprocess.STDOUT) - for line in out.splitlines(): - if line.startswith('FILE='): - splitval = line.rstrip().split('=') - if len(splitval) > 1: - recipes.append(splitval[1].strip('"')) - break - except subprocess.CalledProcessError as e: - print('ERROR: Failed to get recipe for target %s:\n%s' % (target, e.output)) - return 1 - - try: - out = subprocess.check_output('bitbake %s -n' % ' '.join(sdk_targets), stderr=subprocess.STDOUT, shell=True) - unexpected = check_unexpected(out, recipes) - except subprocess.CalledProcessError as e: - print('ERROR: Failed to execute dry-run:\n%s' % e.output) - return 1 - - if unexpected: - print('ERROR: Unexpected tasks or setscene left over to be executed:') - for line in unexpected: - print(' ' + line) - return 1 - if __name__ == "__main__": try: ret = main() |