1eb8dc403SDave Cobbley# Development tool - standard commands plugin 2eb8dc403SDave Cobbley# 3eb8dc403SDave Cobbley# Copyright (C) 2014-2017 Intel Corporation 4eb8dc403SDave Cobbley# 5c342db35SBrad Bishop# SPDX-License-Identifier: GPL-2.0-only 6eb8dc403SDave Cobbley# 7eb8dc403SDave Cobbley"""Devtool standard plugins""" 8eb8dc403SDave Cobbley 9eb8dc403SDave Cobbleyimport os 10eb8dc403SDave Cobbleyimport sys 11eb8dc403SDave Cobbleyimport re 12eb8dc403SDave Cobbleyimport shutil 13eb8dc403SDave Cobbleyimport subprocess 14eb8dc403SDave Cobbleyimport tempfile 15eb8dc403SDave Cobbleyimport logging 16eb8dc403SDave Cobbleyimport argparse 17eb8dc403SDave Cobbleyimport argparse_oe 18eb8dc403SDave Cobbleyimport scriptutils 19eb8dc403SDave Cobbleyimport errno 20eb8dc403SDave Cobbleyimport glob 21eb8dc403SDave Cobbleyimport filecmp 22eb8dc403SDave Cobbleyfrom collections import OrderedDict 23eb8dc403SDave Cobbleyfrom devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, update_unlockedsigs, check_prerelease_version, check_git_repo_dirty, check_git_repo_op, DevtoolError 24eb8dc403SDave Cobbleyfrom devtool import parse_recipe 25eb8dc403SDave Cobbley 26eb8dc403SDave Cobbleylogger = logging.getLogger('devtool') 27eb8dc403SDave Cobbley 28eb8dc403SDave Cobbleyoverride_branch_prefix = 'devtool-override-' 29eb8dc403SDave Cobbley 30eb8dc403SDave Cobbley 31eb8dc403SDave Cobbleydef add(args, config, basepath, workspace): 32eb8dc403SDave Cobbley """Entry point for the devtool 'add' subcommand""" 33eb8dc403SDave Cobbley import bb 34eb8dc403SDave Cobbley import oe.recipeutils 35eb8dc403SDave Cobbley 36eb8dc403SDave Cobbley if not args.recipename and not args.srctree and not args.fetch and not args.fetchuri: 37eb8dc403SDave Cobbley raise argparse_oe.ArgumentUsageError('At least one of recipename, srctree, fetchuri or -f/--fetch must be specified', 'add') 38eb8dc403SDave Cobbley 39eb8dc403SDave Cobbley # These are positional arguments, but because we're nice, allow 40eb8dc403SDave Cobbley # specifying e.g. source tree without name, or fetch URI without name or 41eb8dc403SDave Cobbley # source tree (if we can detect that that is what the user meant) 42eb8dc403SDave Cobbley if scriptutils.is_src_url(args.recipename): 43eb8dc403SDave Cobbley if not args.fetchuri: 44eb8dc403SDave Cobbley if args.fetch: 45eb8dc403SDave Cobbley raise DevtoolError('URI specified as positional argument as well as -f/--fetch') 46eb8dc403SDave Cobbley args.fetchuri = args.recipename 47eb8dc403SDave Cobbley args.recipename = '' 48eb8dc403SDave Cobbley elif scriptutils.is_src_url(args.srctree): 49eb8dc403SDave Cobbley if not args.fetchuri: 50eb8dc403SDave Cobbley if args.fetch: 51eb8dc403SDave Cobbley raise DevtoolError('URI specified as positional argument as well as -f/--fetch') 52eb8dc403SDave Cobbley args.fetchuri = args.srctree 53eb8dc403SDave Cobbley args.srctree = '' 54eb8dc403SDave Cobbley elif args.recipename and not args.srctree: 55eb8dc403SDave Cobbley if os.sep in args.recipename: 56eb8dc403SDave Cobbley args.srctree = args.recipename 57eb8dc403SDave Cobbley args.recipename = None 58eb8dc403SDave Cobbley elif os.path.isdir(args.recipename): 591a4b7ee2SBrad Bishop logger.warning('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename) 60eb8dc403SDave Cobbley 61eb8dc403SDave Cobbley if not args.fetchuri: 62eb8dc403SDave Cobbley if args.srcrev: 63eb8dc403SDave Cobbley raise DevtoolError('The -S/--srcrev option is only valid when fetching from an SCM repository') 64eb8dc403SDave Cobbley if args.srcbranch: 65eb8dc403SDave Cobbley raise DevtoolError('The -B/--srcbranch option is only valid when fetching from an SCM repository') 66eb8dc403SDave Cobbley 67eb8dc403SDave Cobbley if args.srctree and os.path.isfile(args.srctree): 68eb8dc403SDave Cobbley args.fetchuri = 'file://' + os.path.abspath(args.srctree) 69eb8dc403SDave Cobbley args.srctree = '' 70eb8dc403SDave Cobbley 71eb8dc403SDave Cobbley if args.fetch: 72eb8dc403SDave Cobbley if args.fetchuri: 73eb8dc403SDave Cobbley raise DevtoolError('URI specified as positional argument as well as -f/--fetch') 74eb8dc403SDave Cobbley else: 751a4b7ee2SBrad Bishop logger.warning('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead') 76eb8dc403SDave Cobbley args.fetchuri = args.fetch 77eb8dc403SDave Cobbley 78eb8dc403SDave Cobbley if args.recipename: 79eb8dc403SDave Cobbley if args.recipename in workspace: 80eb8dc403SDave Cobbley raise DevtoolError("recipe %s is already in your workspace" % 81eb8dc403SDave Cobbley args.recipename) 82eb8dc403SDave Cobbley reason = oe.recipeutils.validate_pn(args.recipename) 83eb8dc403SDave Cobbley if reason: 84eb8dc403SDave Cobbley raise DevtoolError(reason) 85eb8dc403SDave Cobbley 86eb8dc403SDave Cobbley if args.srctree: 87eb8dc403SDave Cobbley srctree = os.path.abspath(args.srctree) 88eb8dc403SDave Cobbley srctreeparent = None 89eb8dc403SDave Cobbley tmpsrcdir = None 90eb8dc403SDave Cobbley else: 91eb8dc403SDave Cobbley srctree = None 92eb8dc403SDave Cobbley srctreeparent = get_default_srctree(config) 93eb8dc403SDave Cobbley bb.utils.mkdirhier(srctreeparent) 94eb8dc403SDave Cobbley tmpsrcdir = tempfile.mkdtemp(prefix='devtoolsrc', dir=srctreeparent) 95eb8dc403SDave Cobbley 96eb8dc403SDave Cobbley if srctree and os.path.exists(srctree): 97eb8dc403SDave Cobbley if args.fetchuri: 98eb8dc403SDave Cobbley if not os.path.isdir(srctree): 99eb8dc403SDave Cobbley raise DevtoolError("Cannot fetch into source tree path %s as " 100eb8dc403SDave Cobbley "it exists and is not a directory" % 101eb8dc403SDave Cobbley srctree) 102eb8dc403SDave Cobbley elif os.listdir(srctree): 103eb8dc403SDave Cobbley raise DevtoolError("Cannot fetch into source tree path %s as " 104eb8dc403SDave Cobbley "it already exists and is non-empty" % 105eb8dc403SDave Cobbley srctree) 106eb8dc403SDave Cobbley elif not args.fetchuri: 107eb8dc403SDave Cobbley if args.srctree: 108eb8dc403SDave Cobbley raise DevtoolError("Specified source tree %s could not be found" % 109eb8dc403SDave Cobbley args.srctree) 110eb8dc403SDave Cobbley elif srctree: 111eb8dc403SDave Cobbley raise DevtoolError("No source tree exists at default path %s - " 112eb8dc403SDave Cobbley "either create and populate this directory, " 113eb8dc403SDave Cobbley "or specify a path to a source tree, or a " 114eb8dc403SDave Cobbley "URI to fetch source from" % srctree) 115eb8dc403SDave Cobbley else: 116eb8dc403SDave Cobbley raise DevtoolError("You must either specify a source tree " 117eb8dc403SDave Cobbley "or a URI to fetch source from") 118eb8dc403SDave Cobbley 119eb8dc403SDave Cobbley if args.version: 120eb8dc403SDave Cobbley if '_' in args.version or ' ' in args.version: 121eb8dc403SDave Cobbley raise DevtoolError('Invalid version string "%s"' % args.version) 122eb8dc403SDave Cobbley 123eb8dc403SDave Cobbley if args.color == 'auto' and sys.stdout.isatty(): 124eb8dc403SDave Cobbley color = 'always' 125eb8dc403SDave Cobbley else: 126eb8dc403SDave Cobbley color = args.color 127eb8dc403SDave Cobbley extracmdopts = '' 128eb8dc403SDave Cobbley if args.fetchuri: 129eb8dc403SDave Cobbley source = args.fetchuri 130eb8dc403SDave Cobbley if srctree: 131eb8dc403SDave Cobbley extracmdopts += ' -x %s' % srctree 132eb8dc403SDave Cobbley else: 133eb8dc403SDave Cobbley extracmdopts += ' -x %s' % tmpsrcdir 134eb8dc403SDave Cobbley else: 135eb8dc403SDave Cobbley source = srctree 136eb8dc403SDave Cobbley if args.recipename: 137eb8dc403SDave Cobbley extracmdopts += ' -N %s' % args.recipename 138eb8dc403SDave Cobbley if args.version: 139eb8dc403SDave Cobbley extracmdopts += ' -V %s' % args.version 140eb8dc403SDave Cobbley if args.binary: 141eb8dc403SDave Cobbley extracmdopts += ' -b' 142eb8dc403SDave Cobbley if args.also_native: 143eb8dc403SDave Cobbley extracmdopts += ' --also-native' 144eb8dc403SDave Cobbley if args.src_subdir: 145eb8dc403SDave Cobbley extracmdopts += ' --src-subdir "%s"' % args.src_subdir 146eb8dc403SDave Cobbley if args.autorev: 147eb8dc403SDave Cobbley extracmdopts += ' -a' 148eb8dc403SDave Cobbley if args.fetch_dev: 149eb8dc403SDave Cobbley extracmdopts += ' --fetch-dev' 150eb8dc403SDave Cobbley if args.mirrors: 151eb8dc403SDave Cobbley extracmdopts += ' --mirrors' 152eb8dc403SDave Cobbley if args.srcrev: 153eb8dc403SDave Cobbley extracmdopts += ' --srcrev %s' % args.srcrev 154eb8dc403SDave Cobbley if args.srcbranch: 155eb8dc403SDave Cobbley extracmdopts += ' --srcbranch %s' % args.srcbranch 156eb8dc403SDave Cobbley if args.provides: 157eb8dc403SDave Cobbley extracmdopts += ' --provides %s' % args.provides 158eb8dc403SDave Cobbley 159eb8dc403SDave Cobbley tempdir = tempfile.mkdtemp(prefix='devtool') 160eb8dc403SDave Cobbley try: 161eb8dc403SDave Cobbley try: 162eb8dc403SDave Cobbley stdout, _ = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create --devtool -o %s \'%s\' %s' % (color, tempdir, source, extracmdopts), watch=True) 163eb8dc403SDave Cobbley except bb.process.ExecutionError as e: 164eb8dc403SDave Cobbley if e.exitcode == 15: 165eb8dc403SDave Cobbley raise DevtoolError('Could not auto-determine recipe name, please specify it on the command line') 166eb8dc403SDave Cobbley else: 167eb8dc403SDave Cobbley raise DevtoolError('Command \'%s\' failed' % e.command) 168eb8dc403SDave Cobbley 169eb8dc403SDave Cobbley recipes = glob.glob(os.path.join(tempdir, '*.bb')) 170eb8dc403SDave Cobbley if recipes: 171eb8dc403SDave Cobbley recipename = os.path.splitext(os.path.basename(recipes[0]))[0].split('_')[0] 172eb8dc403SDave Cobbley if recipename in workspace: 173eb8dc403SDave Cobbley raise DevtoolError('A recipe with the same name as the one being created (%s) already exists in your workspace' % recipename) 174eb8dc403SDave Cobbley recipedir = os.path.join(config.workspace_path, 'recipes', recipename) 175eb8dc403SDave Cobbley bb.utils.mkdirhier(recipedir) 176eb8dc403SDave Cobbley recipefile = os.path.join(recipedir, os.path.basename(recipes[0])) 177eb8dc403SDave Cobbley appendfile = recipe_to_append(recipefile, config) 178eb8dc403SDave Cobbley if os.path.exists(appendfile): 179eb8dc403SDave Cobbley # This shouldn't be possible, but just in case 180eb8dc403SDave Cobbley raise DevtoolError('A recipe with the same name as the one being created already exists in your workspace') 181eb8dc403SDave Cobbley if os.path.exists(recipefile): 182eb8dc403SDave Cobbley raise DevtoolError('A recipe file %s already exists in your workspace; this shouldn\'t be there - please delete it before continuing' % recipefile) 183eb8dc403SDave Cobbley if tmpsrcdir: 184eb8dc403SDave Cobbley srctree = os.path.join(srctreeparent, recipename) 185eb8dc403SDave Cobbley if os.path.exists(tmpsrcdir): 186eb8dc403SDave Cobbley if os.path.exists(srctree): 187eb8dc403SDave Cobbley if os.path.isdir(srctree): 188eb8dc403SDave Cobbley try: 189eb8dc403SDave Cobbley os.rmdir(srctree) 190eb8dc403SDave Cobbley except OSError as e: 191eb8dc403SDave Cobbley if e.errno == errno.ENOTEMPTY: 192eb8dc403SDave Cobbley raise DevtoolError('Source tree path %s already exists and is not empty' % srctree) 193eb8dc403SDave Cobbley else: 194eb8dc403SDave Cobbley raise 195eb8dc403SDave Cobbley else: 196eb8dc403SDave Cobbley raise DevtoolError('Source tree path %s already exists and is not a directory' % srctree) 197eb8dc403SDave Cobbley logger.info('Using default source tree path %s' % srctree) 198eb8dc403SDave Cobbley shutil.move(tmpsrcdir, srctree) 199eb8dc403SDave Cobbley else: 200eb8dc403SDave Cobbley raise DevtoolError('Couldn\'t find source tree created by recipetool') 201eb8dc403SDave Cobbley bb.utils.mkdirhier(recipedir) 202eb8dc403SDave Cobbley shutil.move(recipes[0], recipefile) 203eb8dc403SDave Cobbley # Move any additional files created by recipetool 204eb8dc403SDave Cobbley for fn in os.listdir(tempdir): 205eb8dc403SDave Cobbley shutil.move(os.path.join(tempdir, fn), recipedir) 206eb8dc403SDave Cobbley else: 207eb8dc403SDave Cobbley raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout)) 208eb8dc403SDave Cobbley attic_recipe = os.path.join(config.workspace_path, 'attic', recipename, os.path.basename(recipefile)) 209eb8dc403SDave Cobbley if os.path.exists(attic_recipe): 2101a4b7ee2SBrad Bishop logger.warning('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe) 211eb8dc403SDave Cobbley finally: 212eb8dc403SDave Cobbley if tmpsrcdir and os.path.exists(tmpsrcdir): 213eb8dc403SDave Cobbley shutil.rmtree(tmpsrcdir) 214eb8dc403SDave Cobbley shutil.rmtree(tempdir) 215eb8dc403SDave Cobbley 216eb8dc403SDave Cobbley for fn in os.listdir(recipedir): 217eb8dc403SDave Cobbley _add_md5(config, recipename, os.path.join(recipedir, fn)) 218eb8dc403SDave Cobbley 219eb8dc403SDave Cobbley tinfoil = setup_tinfoil(config_only=True, basepath=basepath) 220eb8dc403SDave Cobbley try: 221eb8dc403SDave Cobbley try: 222eb8dc403SDave Cobbley rd = tinfoil.parse_recipe_file(recipefile, False) 223eb8dc403SDave Cobbley except Exception as e: 224eb8dc403SDave Cobbley logger.error(str(e)) 225eb8dc403SDave Cobbley rd = None 226eb8dc403SDave Cobbley if not rd: 227eb8dc403SDave Cobbley # Parsing failed. We just created this recipe and we shouldn't 228eb8dc403SDave Cobbley # leave it in the workdir or it'll prevent bitbake from starting 229eb8dc403SDave Cobbley movefn = '%s.parsefailed' % recipefile 230eb8dc403SDave Cobbley logger.error('Parsing newly created recipe failed, moving recipe to %s for reference. If this looks to be caused by the recipe itself, please report this error.' % movefn) 231eb8dc403SDave Cobbley shutil.move(recipefile, movefn) 232eb8dc403SDave Cobbley return 1 233eb8dc403SDave Cobbley 234eb8dc403SDave Cobbley if args.fetchuri and not args.no_git: 235eb8dc403SDave Cobbley setup_git_repo(srctree, args.version, 'devtool', d=tinfoil.config_data) 236eb8dc403SDave Cobbley 237eb8dc403SDave Cobbley initial_rev = None 238eb8dc403SDave Cobbley if os.path.exists(os.path.join(srctree, '.git')): 239eb8dc403SDave Cobbley (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) 240eb8dc403SDave Cobbley initial_rev = stdout.rstrip() 241eb8dc403SDave Cobbley 242eb8dc403SDave Cobbley if args.src_subdir: 243eb8dc403SDave Cobbley srctree = os.path.join(srctree, args.src_subdir) 244eb8dc403SDave Cobbley 245eb8dc403SDave Cobbley bb.utils.mkdirhier(os.path.dirname(appendfile)) 246eb8dc403SDave Cobbley with open(appendfile, 'w') as f: 247eb8dc403SDave Cobbley f.write('inherit externalsrc\n') 248eb8dc403SDave Cobbley f.write('EXTERNALSRC = "%s"\n' % srctree) 249eb8dc403SDave Cobbley 250eb8dc403SDave Cobbley b_is_s = use_external_build(args.same_dir, args.no_same_dir, rd) 251eb8dc403SDave Cobbley if b_is_s: 252eb8dc403SDave Cobbley f.write('EXTERNALSRC_BUILD = "%s"\n' % srctree) 253eb8dc403SDave Cobbley if initial_rev: 254eb8dc403SDave Cobbley f.write('\n# initial_rev: %s\n' % initial_rev) 255eb8dc403SDave Cobbley 256eb8dc403SDave Cobbley if args.binary: 257eb8dc403SDave Cobbley f.write('do_install_append() {\n') 258eb8dc403SDave Cobbley f.write(' rm -rf ${D}/.git\n') 259eb8dc403SDave Cobbley f.write(' rm -f ${D}/singletask.lock\n') 260eb8dc403SDave Cobbley f.write('}\n') 261eb8dc403SDave Cobbley 262eb8dc403SDave Cobbley if bb.data.inherits_class('npm', rd): 263eb8dc403SDave Cobbley f.write('do_install_append() {\n') 264eb8dc403SDave Cobbley f.write(' # Remove files added to source dir by devtool/externalsrc\n') 265eb8dc403SDave Cobbley f.write(' rm -f ${NPM_INSTALLDIR}/singletask.lock\n') 266eb8dc403SDave Cobbley f.write(' rm -rf ${NPM_INSTALLDIR}/.git\n') 267eb8dc403SDave Cobbley f.write(' rm -rf ${NPM_INSTALLDIR}/oe-local-files\n') 268eb8dc403SDave Cobbley f.write(' for symlink in ${EXTERNALSRC_SYMLINKS} ; do\n') 269eb8dc403SDave Cobbley f.write(' rm -f ${NPM_INSTALLDIR}/${symlink%%:*}\n') 270eb8dc403SDave Cobbley f.write(' done\n') 271eb8dc403SDave Cobbley f.write('}\n') 272eb8dc403SDave Cobbley 273eb8dc403SDave Cobbley # Check if the new layer provides recipes whose priorities have been 274eb8dc403SDave Cobbley # overriden by PREFERRED_PROVIDER. 275eb8dc403SDave Cobbley recipe_name = rd.getVar('PN') 276eb8dc403SDave Cobbley provides = rd.getVar('PROVIDES') 277eb8dc403SDave Cobbley # Search every item defined in PROVIDES 278eb8dc403SDave Cobbley for recipe_provided in provides.split(): 279eb8dc403SDave Cobbley preferred_provider = 'PREFERRED_PROVIDER_' + recipe_provided 280eb8dc403SDave Cobbley current_pprovider = rd.getVar(preferred_provider) 281eb8dc403SDave Cobbley if current_pprovider and current_pprovider != recipe_name: 282eb8dc403SDave Cobbley if args.fixed_setup: 283eb8dc403SDave Cobbley #if we are inside the eSDK add the new PREFERRED_PROVIDER in the workspace layer.conf 284eb8dc403SDave Cobbley layerconf_file = os.path.join(config.workspace_path, "conf", "layer.conf") 285eb8dc403SDave Cobbley with open(layerconf_file, 'a') as f: 286eb8dc403SDave Cobbley f.write('%s = "%s"\n' % (preferred_provider, recipe_name)) 287eb8dc403SDave Cobbley else: 2881a4b7ee2SBrad Bishop logger.warning('Set \'%s\' in order to use the recipe' % preferred_provider) 289eb8dc403SDave Cobbley break 290eb8dc403SDave Cobbley 291eb8dc403SDave Cobbley _add_md5(config, recipename, appendfile) 292eb8dc403SDave Cobbley 293eb8dc403SDave Cobbley check_prerelease_version(rd.getVar('PV'), 'devtool add') 294eb8dc403SDave Cobbley 295eb8dc403SDave Cobbley logger.info('Recipe %s has been automatically created; further editing may be required to make it fully functional' % recipefile) 296eb8dc403SDave Cobbley 297eb8dc403SDave Cobbley finally: 298eb8dc403SDave Cobbley tinfoil.shutdown() 299eb8dc403SDave Cobbley 300eb8dc403SDave Cobbley return 0 301eb8dc403SDave Cobbley 302eb8dc403SDave Cobbley 303eb8dc403SDave Cobbleydef _check_compatible_recipe(pn, d): 304eb8dc403SDave Cobbley """Check if the recipe is supported by devtool""" 305eb8dc403SDave Cobbley if pn == 'perf': 306eb8dc403SDave Cobbley raise DevtoolError("The perf recipe does not actually check out " 307eb8dc403SDave Cobbley "source and thus cannot be supported by this tool", 308eb8dc403SDave Cobbley 4) 309eb8dc403SDave Cobbley 310eb8dc403SDave Cobbley if pn in ['kernel-devsrc', 'package-index'] or pn.startswith('gcc-source'): 311eb8dc403SDave Cobbley raise DevtoolError("The %s recipe is not supported by this tool" % pn, 4) 312eb8dc403SDave Cobbley 313eb8dc403SDave Cobbley if bb.data.inherits_class('image', d): 314eb8dc403SDave Cobbley raise DevtoolError("The %s recipe is an image, and therefore is not " 315eb8dc403SDave Cobbley "supported by this tool" % pn, 4) 316eb8dc403SDave Cobbley 317eb8dc403SDave Cobbley if bb.data.inherits_class('populate_sdk', d): 318eb8dc403SDave Cobbley raise DevtoolError("The %s recipe is an SDK, and therefore is not " 319eb8dc403SDave Cobbley "supported by this tool" % pn, 4) 320eb8dc403SDave Cobbley 321eb8dc403SDave Cobbley if bb.data.inherits_class('packagegroup', d): 322eb8dc403SDave Cobbley raise DevtoolError("The %s recipe is a packagegroup, and therefore is " 323eb8dc403SDave Cobbley "not supported by this tool" % pn, 4) 324eb8dc403SDave Cobbley 325eb8dc403SDave Cobbley if bb.data.inherits_class('meta', d): 326eb8dc403SDave Cobbley raise DevtoolError("The %s recipe is a meta-recipe, and therefore is " 327eb8dc403SDave Cobbley "not supported by this tool" % pn, 4) 328eb8dc403SDave Cobbley 329eb8dc403SDave Cobbley if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC'): 330eb8dc403SDave Cobbley # Not an incompatibility error per se, so we don't pass the error code 331eb8dc403SDave Cobbley raise DevtoolError("externalsrc is currently enabled for the %s " 332eb8dc403SDave Cobbley "recipe. This prevents the normal do_patch task " 333eb8dc403SDave Cobbley "from working. You will need to disable this " 334eb8dc403SDave Cobbley "first." % pn) 335eb8dc403SDave Cobbley 336eb8dc403SDave Cobbleydef _dry_run_copy(src, dst, dry_run_outdir, base_outdir): 337eb8dc403SDave Cobbley """Common function for copying a file to the dry run output directory""" 338eb8dc403SDave Cobbley relpath = os.path.relpath(dst, base_outdir) 339eb8dc403SDave Cobbley if relpath.startswith('..'): 340eb8dc403SDave Cobbley raise Exception('Incorrect base path %s for path %s' % (base_outdir, dst)) 341eb8dc403SDave Cobbley dst = os.path.join(dry_run_outdir, relpath) 342eb8dc403SDave Cobbley dst_d = os.path.dirname(dst) 343eb8dc403SDave Cobbley if dst_d: 344eb8dc403SDave Cobbley bb.utils.mkdirhier(dst_d) 345eb8dc403SDave Cobbley # Don't overwrite existing files, otherwise in the case of an upgrade 346eb8dc403SDave Cobbley # the dry-run written out recipe will be overwritten with an unmodified 347eb8dc403SDave Cobbley # version 348eb8dc403SDave Cobbley if not os.path.exists(dst): 349eb8dc403SDave Cobbley shutil.copy(src, dst) 350eb8dc403SDave Cobbley 351eb8dc403SDave Cobbleydef _move_file(src, dst, dry_run_outdir=None, base_outdir=None): 352eb8dc403SDave Cobbley """Move a file. Creates all the directory components of destination path.""" 353eb8dc403SDave Cobbley dry_run_suffix = ' (dry-run)' if dry_run_outdir else '' 354eb8dc403SDave Cobbley logger.debug('Moving %s to %s%s' % (src, dst, dry_run_suffix)) 355eb8dc403SDave Cobbley if dry_run_outdir: 356eb8dc403SDave Cobbley # We want to copy here, not move 357eb8dc403SDave Cobbley _dry_run_copy(src, dst, dry_run_outdir, base_outdir) 358eb8dc403SDave Cobbley else: 359eb8dc403SDave Cobbley dst_d = os.path.dirname(dst) 360eb8dc403SDave Cobbley if dst_d: 361eb8dc403SDave Cobbley bb.utils.mkdirhier(dst_d) 362eb8dc403SDave Cobbley shutil.move(src, dst) 363eb8dc403SDave Cobbley 364eb8dc403SDave Cobbleydef _copy_file(src, dst, dry_run_outdir=None): 365eb8dc403SDave Cobbley """Copy a file. Creates all the directory components of destination path.""" 366eb8dc403SDave Cobbley dry_run_suffix = ' (dry-run)' if dry_run_outdir else '' 367eb8dc403SDave Cobbley logger.debug('Copying %s to %s%s' % (src, dst, dry_run_suffix)) 368eb8dc403SDave Cobbley if dry_run_outdir: 369eb8dc403SDave Cobbley _dry_run_copy(src, dst, dry_run_outdir, base_outdir) 370eb8dc403SDave Cobbley else: 371eb8dc403SDave Cobbley dst_d = os.path.dirname(dst) 372eb8dc403SDave Cobbley if dst_d: 373eb8dc403SDave Cobbley bb.utils.mkdirhier(dst_d) 374eb8dc403SDave Cobbley shutil.copy(src, dst) 375eb8dc403SDave Cobbley 376eb8dc403SDave Cobbleydef _git_ls_tree(repodir, treeish='HEAD', recursive=False): 377eb8dc403SDave Cobbley """List contents of a git treeish""" 378eb8dc403SDave Cobbley import bb 379eb8dc403SDave Cobbley cmd = ['git', 'ls-tree', '-z', treeish] 380eb8dc403SDave Cobbley if recursive: 381eb8dc403SDave Cobbley cmd.append('-r') 382eb8dc403SDave Cobbley out, _ = bb.process.run(cmd, cwd=repodir) 383eb8dc403SDave Cobbley ret = {} 384eb8dc403SDave Cobbley if out: 385eb8dc403SDave Cobbley for line in out.split('\0'): 386eb8dc403SDave Cobbley if line: 387eb8dc403SDave Cobbley split = line.split(None, 4) 388eb8dc403SDave Cobbley ret[split[3]] = split[0:3] 389eb8dc403SDave Cobbley return ret 390eb8dc403SDave Cobbley 391eb8dc403SDave Cobbleydef _git_exclude_path(srctree, path): 392eb8dc403SDave Cobbley """Return pathspec (list of paths) that excludes certain path""" 393eb8dc403SDave Cobbley # NOTE: "Filtering out" files/paths in this way is not entirely reliable - 394eb8dc403SDave Cobbley # we don't catch files that are deleted, for example. A more reliable way 395eb8dc403SDave Cobbley # to implement this would be to use "negative pathspecs" which were 396eb8dc403SDave Cobbley # introduced in Git v1.9.0. Revisit this when/if the required Git version 397eb8dc403SDave Cobbley # becomes greater than that. 398eb8dc403SDave Cobbley path = os.path.normpath(path) 399eb8dc403SDave Cobbley recurse = True if len(path.split(os.path.sep)) > 1 else False 400eb8dc403SDave Cobbley git_files = list(_git_ls_tree(srctree, 'HEAD', recurse).keys()) 401eb8dc403SDave Cobbley if path in git_files: 402eb8dc403SDave Cobbley git_files.remove(path) 403eb8dc403SDave Cobbley return git_files 404eb8dc403SDave Cobbley else: 405eb8dc403SDave Cobbley return ['.'] 406eb8dc403SDave Cobbley 407eb8dc403SDave Cobbleydef _ls_tree(directory): 408eb8dc403SDave Cobbley """Recursive listing of files in a directory""" 409eb8dc403SDave Cobbley ret = [] 410eb8dc403SDave Cobbley for root, dirs, files in os.walk(directory): 411eb8dc403SDave Cobbley ret.extend([os.path.relpath(os.path.join(root, fname), directory) for 412eb8dc403SDave Cobbley fname in files]) 413eb8dc403SDave Cobbley return ret 414eb8dc403SDave Cobbley 415eb8dc403SDave Cobbley 416eb8dc403SDave Cobbleydef extract(args, config, basepath, workspace): 417eb8dc403SDave Cobbley """Entry point for the devtool 'extract' subcommand""" 418eb8dc403SDave Cobbley import bb 419eb8dc403SDave Cobbley 420eb8dc403SDave Cobbley tinfoil = setup_tinfoil(basepath=basepath, tracking=True) 421eb8dc403SDave Cobbley if not tinfoil: 422eb8dc403SDave Cobbley # Error already shown 423eb8dc403SDave Cobbley return 1 424eb8dc403SDave Cobbley try: 425eb8dc403SDave Cobbley rd = parse_recipe(config, tinfoil, args.recipename, True) 426eb8dc403SDave Cobbley if not rd: 427eb8dc403SDave Cobbley return 1 428eb8dc403SDave Cobbley 429eb8dc403SDave Cobbley srctree = os.path.abspath(args.srctree) 430eb8dc403SDave Cobbley initial_rev, _ = _extract_source(srctree, args.keep_temp, args.branch, False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides) 431eb8dc403SDave Cobbley logger.info('Source tree extracted to %s' % srctree) 432eb8dc403SDave Cobbley 433eb8dc403SDave Cobbley if initial_rev: 434eb8dc403SDave Cobbley return 0 435eb8dc403SDave Cobbley else: 436eb8dc403SDave Cobbley return 1 437eb8dc403SDave Cobbley finally: 438eb8dc403SDave Cobbley tinfoil.shutdown() 439eb8dc403SDave Cobbley 440eb8dc403SDave Cobbleydef sync(args, config, basepath, workspace): 441eb8dc403SDave Cobbley """Entry point for the devtool 'sync' subcommand""" 442eb8dc403SDave Cobbley import bb 443eb8dc403SDave Cobbley 444eb8dc403SDave Cobbley tinfoil = setup_tinfoil(basepath=basepath, tracking=True) 445eb8dc403SDave Cobbley if not tinfoil: 446eb8dc403SDave Cobbley # Error already shown 447eb8dc403SDave Cobbley return 1 448eb8dc403SDave Cobbley try: 449eb8dc403SDave Cobbley rd = parse_recipe(config, tinfoil, args.recipename, True) 450eb8dc403SDave Cobbley if not rd: 451eb8dc403SDave Cobbley return 1 452eb8dc403SDave Cobbley 453eb8dc403SDave Cobbley srctree = os.path.abspath(args.srctree) 454eb8dc403SDave Cobbley initial_rev, _ = _extract_source(srctree, args.keep_temp, args.branch, True, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=True) 455eb8dc403SDave Cobbley logger.info('Source tree %s synchronized' % srctree) 456eb8dc403SDave Cobbley 457eb8dc403SDave Cobbley if initial_rev: 458eb8dc403SDave Cobbley return 0 459eb8dc403SDave Cobbley else: 460eb8dc403SDave Cobbley return 1 461eb8dc403SDave Cobbley finally: 462eb8dc403SDave Cobbley tinfoil.shutdown() 463eb8dc403SDave Cobbley 46496ff1984SBrad Bishopdef symlink_oelocal_files_srctree(rd,srctree): 46596ff1984SBrad Bishop import oe.patch 46696ff1984SBrad Bishop if os.path.abspath(rd.getVar('S')) == os.path.abspath(rd.getVar('WORKDIR')): 46796ff1984SBrad Bishop # If recipe extracts to ${WORKDIR}, symlink the files into the srctree 46896ff1984SBrad Bishop # (otherwise the recipe won't build as expected) 46996ff1984SBrad Bishop local_files_dir = os.path.join(srctree, 'oe-local-files') 47096ff1984SBrad Bishop addfiles = [] 47196ff1984SBrad Bishop for root, _, files in os.walk(local_files_dir): 47296ff1984SBrad Bishop relpth = os.path.relpath(root, local_files_dir) 47396ff1984SBrad Bishop if relpth != '.': 47496ff1984SBrad Bishop bb.utils.mkdirhier(os.path.join(srctree, relpth)) 47596ff1984SBrad Bishop for fn in files: 47696ff1984SBrad Bishop if fn == '.gitignore': 47796ff1984SBrad Bishop continue 47896ff1984SBrad Bishop destpth = os.path.join(srctree, relpth, fn) 47996ff1984SBrad Bishop if os.path.exists(destpth): 48096ff1984SBrad Bishop os.unlink(destpth) 48196ff1984SBrad Bishop os.symlink('oe-local-files/%s' % fn, destpth) 48296ff1984SBrad Bishop addfiles.append(os.path.join(relpth, fn)) 48396ff1984SBrad Bishop if addfiles: 48496ff1984SBrad Bishop bb.process.run('git add %s' % ' '.join(addfiles), cwd=srctree) 48596ff1984SBrad Bishop useroptions = [] 48696ff1984SBrad Bishop oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd) 48779641f25SBrad Bishop bb.process.run('git %s commit -m "Committing local file symlinks\n\n%s"' % (' '.join(useroptions), oe.patch.GitApplyTree.ignore_commit_prefix), cwd=srctree) 48896ff1984SBrad Bishop 489eb8dc403SDave Cobbley 490eb8dc403SDave Cobbleydef _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, workspace, fixed_setup, d, tinfoil, no_overrides=False): 491eb8dc403SDave Cobbley """Extract sources of a recipe""" 492eb8dc403SDave Cobbley import oe.recipeutils 493eb8dc403SDave Cobbley import oe.patch 49496ff1984SBrad Bishop import oe.path 495eb8dc403SDave Cobbley 496eb8dc403SDave Cobbley pn = d.getVar('PN') 497eb8dc403SDave Cobbley 498eb8dc403SDave Cobbley _check_compatible_recipe(pn, d) 499eb8dc403SDave Cobbley 500eb8dc403SDave Cobbley if sync: 501eb8dc403SDave Cobbley if not os.path.exists(srctree): 502eb8dc403SDave Cobbley raise DevtoolError("output path %s does not exist" % srctree) 503eb8dc403SDave Cobbley else: 504eb8dc403SDave Cobbley if os.path.exists(srctree): 505eb8dc403SDave Cobbley if not os.path.isdir(srctree): 506eb8dc403SDave Cobbley raise DevtoolError("output path %s exists and is not a directory" % 507eb8dc403SDave Cobbley srctree) 508eb8dc403SDave Cobbley elif os.listdir(srctree): 509eb8dc403SDave Cobbley raise DevtoolError("output path %s already exists and is " 510eb8dc403SDave Cobbley "non-empty" % srctree) 511eb8dc403SDave Cobbley 512eb8dc403SDave Cobbley if 'noexec' in (d.getVarFlags('do_unpack', False) or []): 513eb8dc403SDave Cobbley raise DevtoolError("The %s recipe has do_unpack disabled, unable to " 514eb8dc403SDave Cobbley "extract source" % pn, 4) 515eb8dc403SDave Cobbley 516eb8dc403SDave Cobbley if not sync: 517eb8dc403SDave Cobbley # Prepare for shutil.move later on 518eb8dc403SDave Cobbley bb.utils.mkdirhier(srctree) 519eb8dc403SDave Cobbley os.rmdir(srctree) 520eb8dc403SDave Cobbley 521eb8dc403SDave Cobbley extra_overrides = [] 522eb8dc403SDave Cobbley if not no_overrides: 523eb8dc403SDave Cobbley history = d.varhistory.variable('SRC_URI') 524eb8dc403SDave Cobbley for event in history: 525eb8dc403SDave Cobbley if not 'flag' in event: 526eb8dc403SDave Cobbley if event['op'].startswith(('_append[', '_prepend[')): 527eb8dc403SDave Cobbley extra_overrides.append(event['op'].split('[')[1].split(']')[0]) 52899467dabSAndrew Geissler # We want to remove duplicate overrides. If a recipe had multiple 52999467dabSAndrew Geissler # SRC_URI_override += values it would cause mulitple instances of 53099467dabSAndrew Geissler # overrides. This doesn't play nicely with things like creating a 53199467dabSAndrew Geissler # branch for every instance of DEVTOOL_EXTRA_OVERRIDES. 53299467dabSAndrew Geissler extra_overrides = list(set(extra_overrides)) 533eb8dc403SDave Cobbley if extra_overrides: 534eb8dc403SDave Cobbley logger.info('SRC_URI contains some conditional appends/prepends - will create branches to represent these') 535eb8dc403SDave Cobbley 536eb8dc403SDave Cobbley initial_rev = None 537eb8dc403SDave Cobbley 538eb8dc403SDave Cobbley appendexisted = False 539eb8dc403SDave Cobbley recipefile = d.getVar('FILE') 540eb8dc403SDave Cobbley appendfile = recipe_to_append(recipefile, config) 541eb8dc403SDave Cobbley is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d) 542eb8dc403SDave Cobbley 543eb8dc403SDave Cobbley # We need to redirect WORKDIR, STAMPS_DIR etc. under a temporary 544eb8dc403SDave Cobbley # directory so that: 545eb8dc403SDave Cobbley # (a) we pick up all files that get unpacked to the WORKDIR, and 546eb8dc403SDave Cobbley # (b) we don't disturb the existing build 547eb8dc403SDave Cobbley # However, with recipe-specific sysroots the sysroots for the recipe 548eb8dc403SDave Cobbley # will be prepared under WORKDIR, and if we used the system temporary 549eb8dc403SDave Cobbley # directory (i.e. usually /tmp) as used by mkdtemp by default, then 550eb8dc403SDave Cobbley # our attempts to hardlink files into the recipe-specific sysroots 551eb8dc403SDave Cobbley # will fail on systems where /tmp is a different filesystem, and it 552eb8dc403SDave Cobbley # would have to fall back to copying the files which is a waste of 553eb8dc403SDave Cobbley # time. Put the temp directory under the WORKDIR to prevent that from 554eb8dc403SDave Cobbley # being a problem. 555eb8dc403SDave Cobbley tempbasedir = d.getVar('WORKDIR') 556eb8dc403SDave Cobbley bb.utils.mkdirhier(tempbasedir) 557eb8dc403SDave Cobbley tempdir = tempfile.mkdtemp(prefix='devtooltmp-', dir=tempbasedir) 558eb8dc403SDave Cobbley try: 559eb8dc403SDave Cobbley tinfoil.logger.setLevel(logging.WARNING) 560eb8dc403SDave Cobbley 561eb8dc403SDave Cobbley # FIXME this results in a cache reload under control of tinfoil, which is fine 562eb8dc403SDave Cobbley # except we don't get the knotty progress bar 563eb8dc403SDave Cobbley 564eb8dc403SDave Cobbley if os.path.exists(appendfile): 565eb8dc403SDave Cobbley appendbackup = os.path.join(tempdir, os.path.basename(appendfile) + '.bak') 566eb8dc403SDave Cobbley shutil.copyfile(appendfile, appendbackup) 567eb8dc403SDave Cobbley else: 568eb8dc403SDave Cobbley appendbackup = None 569eb8dc403SDave Cobbley bb.utils.mkdirhier(os.path.dirname(appendfile)) 570eb8dc403SDave Cobbley logger.debug('writing append file %s' % appendfile) 571eb8dc403SDave Cobbley with open(appendfile, 'a') as f: 572eb8dc403SDave Cobbley f.write('###--- _extract_source\n') 573eb8dc403SDave Cobbley f.write('DEVTOOL_TEMPDIR = "%s"\n' % tempdir) 574eb8dc403SDave Cobbley f.write('DEVTOOL_DEVBRANCH = "%s"\n' % devbranch) 575eb8dc403SDave Cobbley if not is_kernel_yocto: 576eb8dc403SDave Cobbley f.write('PATCHTOOL = "git"\n') 577eb8dc403SDave Cobbley f.write('PATCH_COMMIT_FUNCTIONS = "1"\n') 578eb8dc403SDave Cobbley if extra_overrides: 579eb8dc403SDave Cobbley f.write('DEVTOOL_EXTRA_OVERRIDES = "%s"\n' % ':'.join(extra_overrides)) 580eb8dc403SDave Cobbley f.write('inherit devtool-source\n') 581eb8dc403SDave Cobbley f.write('###--- _extract_source\n') 582eb8dc403SDave Cobbley 583eb8dc403SDave Cobbley update_unlockedsigs(basepath, workspace, fixed_setup, [pn]) 584eb8dc403SDave Cobbley 585eb8dc403SDave Cobbley sstate_manifests = d.getVar('SSTATE_MANIFESTS') 586eb8dc403SDave Cobbley bb.utils.mkdirhier(sstate_manifests) 587eb8dc403SDave Cobbley preservestampfile = os.path.join(sstate_manifests, 'preserve-stamps') 588eb8dc403SDave Cobbley with open(preservestampfile, 'w') as f: 589eb8dc403SDave Cobbley f.write(d.getVar('STAMP')) 590eb8dc403SDave Cobbley try: 59196ff1984SBrad Bishop if is_kernel_yocto: 592eb8dc403SDave Cobbley # We need to generate the kernel config 593eb8dc403SDave Cobbley task = 'do_configure' 594eb8dc403SDave Cobbley else: 595eb8dc403SDave Cobbley task = 'do_patch' 596eb8dc403SDave Cobbley 597eb8dc403SDave Cobbley # Run the fetch + unpack tasks 598eb8dc403SDave Cobbley res = tinfoil.build_targets(pn, 599eb8dc403SDave Cobbley task, 600eb8dc403SDave Cobbley handle_events=True) 601eb8dc403SDave Cobbley finally: 602eb8dc403SDave Cobbley if os.path.exists(preservestampfile): 603eb8dc403SDave Cobbley os.remove(preservestampfile) 604eb8dc403SDave Cobbley 605eb8dc403SDave Cobbley if not res: 606eb8dc403SDave Cobbley raise DevtoolError('Extracting source for %s failed' % pn) 607eb8dc403SDave Cobbley 608eb8dc403SDave Cobbley try: 609eb8dc403SDave Cobbley with open(os.path.join(tempdir, 'initial_rev'), 'r') as f: 610eb8dc403SDave Cobbley initial_rev = f.read() 611eb8dc403SDave Cobbley 612eb8dc403SDave Cobbley with open(os.path.join(tempdir, 'srcsubdir'), 'r') as f: 613eb8dc403SDave Cobbley srcsubdir = f.read() 614eb8dc403SDave Cobbley except FileNotFoundError as e: 615eb8dc403SDave Cobbley raise DevtoolError('Something went wrong with source extraction - the devtool-source class was not active or did not function correctly:\n%s' % str(e)) 616eb8dc403SDave Cobbley srcsubdir_rel = os.path.relpath(srcsubdir, os.path.join(tempdir, 'workdir')) 617eb8dc403SDave Cobbley 61896ff1984SBrad Bishop # Check if work-shared is empty, if yes 61996ff1984SBrad Bishop # find source and copy to work-shared 62096ff1984SBrad Bishop if is_kernel_yocto: 62196ff1984SBrad Bishop workshareddir = d.getVar('STAGING_KERNEL_DIR') 62296ff1984SBrad Bishop staging_kerVer = get_staging_kver(workshareddir) 62396ff1984SBrad Bishop kernelVersion = d.getVar('LINUX_VERSION') 62496ff1984SBrad Bishop 62596ff1984SBrad Bishop # handle dangling symbolic link in work-shared: 62696ff1984SBrad Bishop if os.path.islink(workshareddir): 62796ff1984SBrad Bishop os.unlink(workshareddir) 62896ff1984SBrad Bishop 62996ff1984SBrad Bishop if os.path.exists(workshareddir) and (not os.listdir(workshareddir) or kernelVersion != staging_kerVer): 63096ff1984SBrad Bishop shutil.rmtree(workshareddir) 63196ff1984SBrad Bishop oe.path.copyhardlinktree(srcsubdir,workshareddir) 63296ff1984SBrad Bishop elif not os.path.exists(workshareddir): 63396ff1984SBrad Bishop oe.path.copyhardlinktree(srcsubdir,workshareddir) 63496ff1984SBrad Bishop 635eb8dc403SDave Cobbley tempdir_localdir = os.path.join(tempdir, 'oe-local-files') 636eb8dc403SDave Cobbley srctree_localdir = os.path.join(srctree, 'oe-local-files') 637eb8dc403SDave Cobbley 638eb8dc403SDave Cobbley if sync: 639eb8dc403SDave Cobbley bb.process.run('git fetch file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) 640eb8dc403SDave Cobbley 641eb8dc403SDave Cobbley # Move oe-local-files directory to srctree 642eb8dc403SDave Cobbley # As the oe-local-files is not part of the constructed git tree, 643eb8dc403SDave Cobbley # remove them directly during the synchrounizating might surprise 644eb8dc403SDave Cobbley # the users. Instead, we move it to oe-local-files.bak and remind 645eb8dc403SDave Cobbley # user in the log message. 646eb8dc403SDave Cobbley if os.path.exists(srctree_localdir + '.bak'): 647eb8dc403SDave Cobbley shutil.rmtree(srctree_localdir, srctree_localdir + '.bak') 648eb8dc403SDave Cobbley 649eb8dc403SDave Cobbley if os.path.exists(srctree_localdir): 650eb8dc403SDave Cobbley logger.info('Backing up current local file directory %s' % srctree_localdir) 651eb8dc403SDave Cobbley shutil.move(srctree_localdir, srctree_localdir + '.bak') 652eb8dc403SDave Cobbley 653eb8dc403SDave Cobbley if os.path.exists(tempdir_localdir): 654eb8dc403SDave Cobbley logger.info('Syncing local source files to srctree...') 655eb8dc403SDave Cobbley shutil.copytree(tempdir_localdir, srctree_localdir) 656eb8dc403SDave Cobbley else: 657eb8dc403SDave Cobbley # Move oe-local-files directory to srctree 658eb8dc403SDave Cobbley if os.path.exists(tempdir_localdir): 659eb8dc403SDave Cobbley logger.info('Adding local source files to srctree...') 660eb8dc403SDave Cobbley shutil.move(tempdir_localdir, srcsubdir) 661eb8dc403SDave Cobbley 662eb8dc403SDave Cobbley shutil.move(srcsubdir, srctree) 66396ff1984SBrad Bishop symlink_oelocal_files_srctree(d,srctree) 664eb8dc403SDave Cobbley 665eb8dc403SDave Cobbley if is_kernel_yocto: 666eb8dc403SDave Cobbley logger.info('Copying kernel config to srctree') 667eb8dc403SDave Cobbley shutil.copy2(os.path.join(tempdir, '.config'), srctree) 668eb8dc403SDave Cobbley 669eb8dc403SDave Cobbley finally: 670eb8dc403SDave Cobbley if appendbackup: 671eb8dc403SDave Cobbley shutil.copyfile(appendbackup, appendfile) 672eb8dc403SDave Cobbley elif os.path.exists(appendfile): 673eb8dc403SDave Cobbley os.remove(appendfile) 674eb8dc403SDave Cobbley if keep_temp: 675eb8dc403SDave Cobbley logger.info('Preserving temporary directory %s' % tempdir) 676eb8dc403SDave Cobbley else: 677eb8dc403SDave Cobbley shutil.rmtree(tempdir) 678eb8dc403SDave Cobbley return initial_rev, srcsubdir_rel 679eb8dc403SDave Cobbley 680eb8dc403SDave Cobbleydef _add_md5(config, recipename, filename): 681eb8dc403SDave Cobbley """Record checksum of a file (or recursively for a directory) to the md5-file of the workspace""" 682eb8dc403SDave Cobbley import bb.utils 683eb8dc403SDave Cobbley 684eb8dc403SDave Cobbley def addfile(fn): 685eb8dc403SDave Cobbley md5 = bb.utils.md5_file(fn) 686eb8dc403SDave Cobbley with open(os.path.join(config.workspace_path, '.devtool_md5'), 'a+') as f: 687eb8dc403SDave Cobbley md5_str = '%s|%s|%s\n' % (recipename, os.path.relpath(fn, config.workspace_path), md5) 688eb8dc403SDave Cobbley f.seek(0, os.SEEK_SET) 689eb8dc403SDave Cobbley if not md5_str in f.read(): 690eb8dc403SDave Cobbley f.write(md5_str) 691eb8dc403SDave Cobbley 692eb8dc403SDave Cobbley if os.path.isdir(filename): 693eb8dc403SDave Cobbley for root, _, files in os.walk(filename): 694eb8dc403SDave Cobbley for f in files: 695eb8dc403SDave Cobbley addfile(os.path.join(root, f)) 696eb8dc403SDave Cobbley else: 697eb8dc403SDave Cobbley addfile(filename) 698eb8dc403SDave Cobbley 699eb8dc403SDave Cobbleydef _check_preserve(config, recipename): 700eb8dc403SDave Cobbley """Check if a file was manually changed and needs to be saved in 'attic' 701eb8dc403SDave Cobbley directory""" 702eb8dc403SDave Cobbley import bb.utils 703eb8dc403SDave Cobbley origfile = os.path.join(config.workspace_path, '.devtool_md5') 704eb8dc403SDave Cobbley newfile = os.path.join(config.workspace_path, '.devtool_md5_new') 705eb8dc403SDave Cobbley preservepath = os.path.join(config.workspace_path, 'attic', recipename) 706eb8dc403SDave Cobbley with open(origfile, 'r') as f: 707eb8dc403SDave Cobbley with open(newfile, 'w') as tf: 708eb8dc403SDave Cobbley for line in f.readlines(): 709eb8dc403SDave Cobbley splitline = line.rstrip().split('|') 710eb8dc403SDave Cobbley if splitline[0] == recipename: 711eb8dc403SDave Cobbley removefile = os.path.join(config.workspace_path, splitline[1]) 712eb8dc403SDave Cobbley try: 713eb8dc403SDave Cobbley md5 = bb.utils.md5_file(removefile) 714eb8dc403SDave Cobbley except IOError as err: 715eb8dc403SDave Cobbley if err.errno == 2: 716eb8dc403SDave Cobbley # File no longer exists, skip it 717eb8dc403SDave Cobbley continue 718eb8dc403SDave Cobbley else: 719eb8dc403SDave Cobbley raise 720eb8dc403SDave Cobbley if splitline[2] != md5: 721eb8dc403SDave Cobbley bb.utils.mkdirhier(preservepath) 722eb8dc403SDave Cobbley preservefile = os.path.basename(removefile) 7231a4b7ee2SBrad Bishop logger.warning('File %s modified since it was written, preserving in %s' % (preservefile, preservepath)) 724eb8dc403SDave Cobbley shutil.move(removefile, os.path.join(preservepath, preservefile)) 725eb8dc403SDave Cobbley else: 726eb8dc403SDave Cobbley os.remove(removefile) 727eb8dc403SDave Cobbley else: 728eb8dc403SDave Cobbley tf.write(line) 729eb8dc403SDave Cobbley os.rename(newfile, origfile) 730eb8dc403SDave Cobbley 73196ff1984SBrad Bishopdef get_staging_kver(srcdir): 73296ff1984SBrad Bishop # Kernel version from work-shared 73396ff1984SBrad Bishop kerver = [] 73496ff1984SBrad Bishop staging_kerVer="" 73596ff1984SBrad Bishop if os.path.exists(srcdir) and os.listdir(srcdir): 73696ff1984SBrad Bishop with open(os.path.join(srcdir,"Makefile")) as f: 73796ff1984SBrad Bishop version = [next(f) for x in range(5)][1:4] 73896ff1984SBrad Bishop for word in version: 73996ff1984SBrad Bishop kerver.append(word.split('= ')[1].split('\n')[0]) 74096ff1984SBrad Bishop staging_kerVer = ".".join(kerver) 74196ff1984SBrad Bishop return staging_kerVer 74296ff1984SBrad Bishop 74396ff1984SBrad Bishopdef get_staging_kbranch(srcdir): 74496ff1984SBrad Bishop staging_kbranch = "" 74596ff1984SBrad Bishop if os.path.exists(srcdir) and os.listdir(srcdir): 74696ff1984SBrad Bishop (branch, _) = bb.process.run('git branch | grep \* | cut -d \' \' -f2', cwd=srcdir) 74796ff1984SBrad Bishop staging_kbranch = "".join(branch.split('\n')[0]) 74896ff1984SBrad Bishop return staging_kbranch 74996ff1984SBrad Bishop 750eb8dc403SDave Cobbleydef modify(args, config, basepath, workspace): 751eb8dc403SDave Cobbley """Entry point for the devtool 'modify' subcommand""" 752eb8dc403SDave Cobbley import bb 753eb8dc403SDave Cobbley import oe.recipeutils 754eb8dc403SDave Cobbley import oe.patch 75596ff1984SBrad Bishop import oe.path 756eb8dc403SDave Cobbley 757eb8dc403SDave Cobbley if args.recipename in workspace: 758eb8dc403SDave Cobbley raise DevtoolError("recipe %s is already in your workspace" % 759eb8dc403SDave Cobbley args.recipename) 760eb8dc403SDave Cobbley 761eb8dc403SDave Cobbley tinfoil = setup_tinfoil(basepath=basepath, tracking=True) 762eb8dc403SDave Cobbley try: 763eb8dc403SDave Cobbley rd = parse_recipe(config, tinfoil, args.recipename, True) 764eb8dc403SDave Cobbley if not rd: 765eb8dc403SDave Cobbley return 1 766eb8dc403SDave Cobbley 767eb8dc403SDave Cobbley pn = rd.getVar('PN') 768eb8dc403SDave Cobbley if pn != args.recipename: 769eb8dc403SDave Cobbley logger.info('Mapping %s to %s' % (args.recipename, pn)) 770eb8dc403SDave Cobbley if pn in workspace: 771eb8dc403SDave Cobbley raise DevtoolError("recipe %s is already in your workspace" % 772eb8dc403SDave Cobbley pn) 773eb8dc403SDave Cobbley 774eb8dc403SDave Cobbley if args.srctree: 775eb8dc403SDave Cobbley srctree = os.path.abspath(args.srctree) 776eb8dc403SDave Cobbley else: 777eb8dc403SDave Cobbley srctree = get_default_srctree(config, pn) 778eb8dc403SDave Cobbley 779eb8dc403SDave Cobbley if args.no_extract and not os.path.isdir(srctree): 780eb8dc403SDave Cobbley raise DevtoolError("--no-extract specified and source path %s does " 781eb8dc403SDave Cobbley "not exist or is not a directory" % 782eb8dc403SDave Cobbley srctree) 783eb8dc403SDave Cobbley 784eb8dc403SDave Cobbley recipefile = rd.getVar('FILE') 785eb8dc403SDave Cobbley appendfile = recipe_to_append(recipefile, config, args.wildcard) 786eb8dc403SDave Cobbley if os.path.exists(appendfile): 787eb8dc403SDave Cobbley raise DevtoolError("Another variant of recipe %s is already in your " 788eb8dc403SDave Cobbley "workspace (only one variant of a recipe can " 789eb8dc403SDave Cobbley "currently be worked on at once)" 790eb8dc403SDave Cobbley % pn) 791eb8dc403SDave Cobbley 792eb8dc403SDave Cobbley _check_compatible_recipe(pn, rd) 793eb8dc403SDave Cobbley 794eb8dc403SDave Cobbley initial_rev = None 795eb8dc403SDave Cobbley commits = [] 796eb8dc403SDave Cobbley check_commits = False 79796ff1984SBrad Bishop 79896ff1984SBrad Bishop if bb.data.inherits_class('kernel-yocto', rd): 79996ff1984SBrad Bishop # Current set kernel version 80096ff1984SBrad Bishop kernelVersion = rd.getVar('LINUX_VERSION') 80196ff1984SBrad Bishop srcdir = rd.getVar('STAGING_KERNEL_DIR') 80296ff1984SBrad Bishop kbranch = rd.getVar('KBRANCH') 80396ff1984SBrad Bishop 80496ff1984SBrad Bishop staging_kerVer = get_staging_kver(srcdir) 80596ff1984SBrad Bishop staging_kbranch = get_staging_kbranch(srcdir) 80696ff1984SBrad Bishop if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): 80796ff1984SBrad Bishop oe.path.copyhardlinktree(srcdir,srctree) 80896ff1984SBrad Bishop workdir = rd.getVar('WORKDIR') 80996ff1984SBrad Bishop srcsubdir = rd.getVar('S') 81096ff1984SBrad Bishop localfilesdir = os.path.join(srctree,'oe-local-files') 81196ff1984SBrad Bishop # Move local source files into separate subdir 81296ff1984SBrad Bishop recipe_patches = [os.path.basename(patch) for patch in oe.recipeutils.get_recipe_patches(rd)] 81396ff1984SBrad Bishop local_files = oe.recipeutils.get_recipe_local_files(rd) 81496ff1984SBrad Bishop 81596ff1984SBrad Bishop for key in local_files.copy(): 81696ff1984SBrad Bishop if key.endswith('scc'): 81796ff1984SBrad Bishop sccfile = open(local_files[key], 'r') 81896ff1984SBrad Bishop for l in sccfile: 81996ff1984SBrad Bishop line = l.split() 82096ff1984SBrad Bishop if line and line[0] in ('kconf', 'patch'): 82196ff1984SBrad Bishop cfg = os.path.join(os.path.dirname(local_files[key]), line[-1]) 82296ff1984SBrad Bishop if not cfg in local_files.values(): 82396ff1984SBrad Bishop local_files[line[-1]] = cfg 82496ff1984SBrad Bishop shutil.copy2(cfg, workdir) 82596ff1984SBrad Bishop sccfile.close() 82696ff1984SBrad Bishop 82796ff1984SBrad Bishop # Ignore local files with subdir={BP} 82896ff1984SBrad Bishop srcabspath = os.path.abspath(srcsubdir) 82996ff1984SBrad Bishop local_files = [fname for fname in local_files if os.path.exists(os.path.join(workdir, fname)) and (srcabspath == workdir or not os.path.join(workdir, fname).startswith(srcabspath + os.sep))] 83096ff1984SBrad Bishop if local_files: 83196ff1984SBrad Bishop for fname in local_files: 83296ff1984SBrad Bishop _move_file(os.path.join(workdir, fname), os.path.join(srctree, 'oe-local-files', fname)) 83396ff1984SBrad Bishop with open(os.path.join(srctree, 'oe-local-files', '.gitignore'), 'w') as f: 83496ff1984SBrad Bishop f.write('# Ignore local files, by default. Remove this file ''if you want to commit the directory to Git\n*\n') 83596ff1984SBrad Bishop 83696ff1984SBrad Bishop symlink_oelocal_files_srctree(rd,srctree) 83796ff1984SBrad Bishop 83896ff1984SBrad Bishop task = 'do_configure' 83996ff1984SBrad Bishop res = tinfoil.build_targets(pn, task, handle_events=True) 84096ff1984SBrad Bishop 84196ff1984SBrad Bishop # Copy .config to workspace 84296ff1984SBrad Bishop kconfpath = rd.getVar('B') 84396ff1984SBrad Bishop logger.info('Copying kernel config to workspace') 84496ff1984SBrad Bishop shutil.copy2(os.path.join(kconfpath, '.config'),srctree) 84596ff1984SBrad Bishop 84696ff1984SBrad Bishop # Set this to true, we still need to get initial_rev 84796ff1984SBrad Bishop # by parsing the git repo 84896ff1984SBrad Bishop args.no_extract = True 84996ff1984SBrad Bishop 850eb8dc403SDave Cobbley if not args.no_extract: 851eb8dc403SDave Cobbley initial_rev, _ = _extract_source(srctree, args.keep_temp, args.branch, False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides) 852eb8dc403SDave Cobbley if not initial_rev: 853eb8dc403SDave Cobbley return 1 854eb8dc403SDave Cobbley logger.info('Source tree extracted to %s' % srctree) 855eb8dc403SDave Cobbley # Get list of commits since this revision 856eb8dc403SDave Cobbley (stdout, _) = bb.process.run('git rev-list --reverse %s..HEAD' % initial_rev, cwd=srctree) 857eb8dc403SDave Cobbley commits = stdout.split() 858eb8dc403SDave Cobbley check_commits = True 859eb8dc403SDave Cobbley else: 860eb8dc403SDave Cobbley if os.path.exists(os.path.join(srctree, '.git')): 86199467dabSAndrew Geissler # Check if it's a tree previously extracted by us. This is done 86299467dabSAndrew Geissler # by ensuring that devtool-base and args.branch (devtool) exist. 86399467dabSAndrew Geissler # The check_commits logic will cause an exception if either one 86499467dabSAndrew Geissler # of these doesn't exist 865eb8dc403SDave Cobbley try: 866eb8dc403SDave Cobbley (stdout, _) = bb.process.run('git branch --contains devtool-base', cwd=srctree) 86799467dabSAndrew Geissler bb.process.run('git rev-parse %s' % args.branch, cwd=srctree) 868eb8dc403SDave Cobbley except bb.process.ExecutionError: 869eb8dc403SDave Cobbley stdout = '' 870eb8dc403SDave Cobbley if stdout: 871eb8dc403SDave Cobbley check_commits = True 872eb8dc403SDave Cobbley for line in stdout.splitlines(): 873eb8dc403SDave Cobbley if line.startswith('*'): 874eb8dc403SDave Cobbley (stdout, _) = bb.process.run('git rev-parse devtool-base', cwd=srctree) 875eb8dc403SDave Cobbley initial_rev = stdout.rstrip() 876eb8dc403SDave Cobbley if not initial_rev: 877eb8dc403SDave Cobbley # Otherwise, just grab the head revision 878eb8dc403SDave Cobbley (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) 879eb8dc403SDave Cobbley initial_rev = stdout.rstrip() 880eb8dc403SDave Cobbley 881eb8dc403SDave Cobbley branch_patches = {} 882eb8dc403SDave Cobbley if check_commits: 883eb8dc403SDave Cobbley # Check if there are override branches 884eb8dc403SDave Cobbley (stdout, _) = bb.process.run('git branch', cwd=srctree) 885eb8dc403SDave Cobbley branches = [] 886eb8dc403SDave Cobbley for line in stdout.rstrip().splitlines(): 887eb8dc403SDave Cobbley branchname = line[2:].rstrip() 888eb8dc403SDave Cobbley if branchname.startswith(override_branch_prefix): 889eb8dc403SDave Cobbley branches.append(branchname) 890eb8dc403SDave Cobbley if branches: 8911a4b7ee2SBrad Bishop logger.warning('SRC_URI is conditionally overridden in this recipe, thus several %s* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the %s branch first, then checkout and rebase each %s* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)' % (override_branch_prefix, args.branch, override_branch_prefix)) 892eb8dc403SDave Cobbley branches.insert(0, args.branch) 893eb8dc403SDave Cobbley seen_patches = [] 894eb8dc403SDave Cobbley for branch in branches: 895eb8dc403SDave Cobbley branch_patches[branch] = [] 896eb8dc403SDave Cobbley (stdout, _) = bb.process.run('git log devtool-base..%s' % branch, cwd=srctree) 897eb8dc403SDave Cobbley for line in stdout.splitlines(): 898eb8dc403SDave Cobbley line = line.strip() 899eb8dc403SDave Cobbley if line.startswith(oe.patch.GitApplyTree.patch_line_prefix): 900eb8dc403SDave Cobbley origpatch = line[len(oe.patch.GitApplyTree.patch_line_prefix):].split(':', 1)[-1].strip() 901eb8dc403SDave Cobbley if not origpatch in seen_patches: 902eb8dc403SDave Cobbley seen_patches.append(origpatch) 903eb8dc403SDave Cobbley branch_patches[branch].append(origpatch) 904eb8dc403SDave Cobbley 905eb8dc403SDave Cobbley # Need to grab this here in case the source is within a subdirectory 906eb8dc403SDave Cobbley srctreebase = srctree 907eb8dc403SDave Cobbley 908eb8dc403SDave Cobbley # Check that recipe isn't using a shared workdir 909eb8dc403SDave Cobbley s = os.path.abspath(rd.getVar('S')) 910eb8dc403SDave Cobbley workdir = os.path.abspath(rd.getVar('WORKDIR')) 911eb8dc403SDave Cobbley if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir: 912eb8dc403SDave Cobbley # Handle if S is set to a subdirectory of the source 913eb8dc403SDave Cobbley srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1] 914eb8dc403SDave Cobbley srctree = os.path.join(srctree, srcsubdir) 915eb8dc403SDave Cobbley 916eb8dc403SDave Cobbley bb.utils.mkdirhier(os.path.dirname(appendfile)) 917eb8dc403SDave Cobbley with open(appendfile, 'w') as f: 918eb8dc403SDave Cobbley f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n') 919eb8dc403SDave Cobbley # Local files can be modified/tracked in separate subdir under srctree 920eb8dc403SDave Cobbley # Mostly useful for packages with S != WORKDIR 921eb8dc403SDave Cobbley f.write('FILESPATH_prepend := "%s:"\n' % 922eb8dc403SDave Cobbley os.path.join(srctreebase, 'oe-local-files')) 923eb8dc403SDave Cobbley f.write('# srctreebase: %s\n' % srctreebase) 924eb8dc403SDave Cobbley 925eb8dc403SDave Cobbley f.write('\ninherit externalsrc\n') 926eb8dc403SDave Cobbley f.write('# NOTE: We use pn- overrides here to avoid affecting multiple variants in the case where the recipe uses BBCLASSEXTEND\n') 927eb8dc403SDave Cobbley f.write('EXTERNALSRC_pn-%s = "%s"\n' % (pn, srctree)) 928eb8dc403SDave Cobbley 929eb8dc403SDave Cobbley b_is_s = use_external_build(args.same_dir, args.no_same_dir, rd) 930eb8dc403SDave Cobbley if b_is_s: 931eb8dc403SDave Cobbley f.write('EXTERNALSRC_BUILD_pn-%s = "%s"\n' % (pn, srctree)) 932eb8dc403SDave Cobbley 933eb8dc403SDave Cobbley if bb.data.inherits_class('kernel', rd): 934eb8dc403SDave Cobbley f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' 935eb8dc403SDave Cobbley 'do_fetch do_unpack do_kernel_configme do_kernel_configcheck"\n') 93619323693SBrad Bishop f.write('\ndo_patch[noexec] = "1"\n') 937eb8dc403SDave Cobbley f.write('\ndo_configure_append() {\n' 938eb8dc403SDave Cobbley ' cp ${B}/.config ${S}/.config.baseline\n' 939eb8dc403SDave Cobbley ' ln -sfT ${B}/.config ${S}/.config.new\n' 940eb8dc403SDave Cobbley '}\n') 94196ff1984SBrad Bishop if rd.getVarFlag('do_menuconfig','task'): 94296ff1984SBrad Bishop f.write('\ndo_configure_append() {\n' 94396ff1984SBrad Bishop ' cp ${B}/.config ${S}/.config.baseline\n' 94496ff1984SBrad Bishop ' ln -sfT ${B}/.config ${S}/.config.new\n' 94596ff1984SBrad Bishop '}\n') 946eb8dc403SDave Cobbley if initial_rev: 947eb8dc403SDave Cobbley f.write('\n# initial_rev: %s\n' % initial_rev) 948eb8dc403SDave Cobbley for commit in commits: 949eb8dc403SDave Cobbley f.write('# commit: %s\n' % commit) 950eb8dc403SDave Cobbley if branch_patches: 951eb8dc403SDave Cobbley for branch in branch_patches: 952eb8dc403SDave Cobbley if branch == args.branch: 953eb8dc403SDave Cobbley continue 954eb8dc403SDave Cobbley f.write('# patches_%s: %s\n' % (branch, ','.join(branch_patches[branch]))) 955eb8dc403SDave Cobbley 956eb8dc403SDave Cobbley update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn]) 957eb8dc403SDave Cobbley 958eb8dc403SDave Cobbley _add_md5(config, pn, appendfile) 959eb8dc403SDave Cobbley 960eb8dc403SDave Cobbley logger.info('Recipe %s now set up to build from %s' % (pn, srctree)) 961eb8dc403SDave Cobbley 962eb8dc403SDave Cobbley finally: 963eb8dc403SDave Cobbley tinfoil.shutdown() 964eb8dc403SDave Cobbley 965eb8dc403SDave Cobbley return 0 966eb8dc403SDave Cobbley 967eb8dc403SDave Cobbley 968eb8dc403SDave Cobbleydef rename(args, config, basepath, workspace): 969eb8dc403SDave Cobbley """Entry point for the devtool 'rename' subcommand""" 970eb8dc403SDave Cobbley import bb 971eb8dc403SDave Cobbley import oe.recipeutils 972eb8dc403SDave Cobbley 973eb8dc403SDave Cobbley check_workspace_recipe(workspace, args.recipename) 974eb8dc403SDave Cobbley 975eb8dc403SDave Cobbley if not (args.newname or args.version): 976eb8dc403SDave Cobbley raise DevtoolError('You must specify a new name, a version with -V/--version, or both') 977eb8dc403SDave Cobbley 978eb8dc403SDave Cobbley recipefile = workspace[args.recipename]['recipefile'] 979eb8dc403SDave Cobbley if not recipefile: 980eb8dc403SDave Cobbley raise DevtoolError('devtool rename can only be used where the recipe file itself is in the workspace (e.g. after devtool add)') 981eb8dc403SDave Cobbley 982eb8dc403SDave Cobbley if args.newname and args.newname != args.recipename: 983eb8dc403SDave Cobbley reason = oe.recipeutils.validate_pn(args.newname) 984eb8dc403SDave Cobbley if reason: 985eb8dc403SDave Cobbley raise DevtoolError(reason) 986eb8dc403SDave Cobbley newname = args.newname 987eb8dc403SDave Cobbley else: 988eb8dc403SDave Cobbley newname = args.recipename 989eb8dc403SDave Cobbley 990eb8dc403SDave Cobbley append = workspace[args.recipename]['bbappend'] 991eb8dc403SDave Cobbley appendfn = os.path.splitext(os.path.basename(append))[0] 992eb8dc403SDave Cobbley splitfn = appendfn.split('_') 993eb8dc403SDave Cobbley if len(splitfn) > 1: 994eb8dc403SDave Cobbley origfnver = appendfn.split('_')[1] 995eb8dc403SDave Cobbley else: 996eb8dc403SDave Cobbley origfnver = '' 997eb8dc403SDave Cobbley 998eb8dc403SDave Cobbley recipefilemd5 = None 999eb8dc403SDave Cobbley tinfoil = setup_tinfoil(basepath=basepath, tracking=True) 1000eb8dc403SDave Cobbley try: 1001eb8dc403SDave Cobbley rd = parse_recipe(config, tinfoil, args.recipename, True) 1002eb8dc403SDave Cobbley if not rd: 1003eb8dc403SDave Cobbley return 1 1004eb8dc403SDave Cobbley 1005eb8dc403SDave Cobbley bp = rd.getVar('BP') 1006eb8dc403SDave Cobbley bpn = rd.getVar('BPN') 1007eb8dc403SDave Cobbley if newname != args.recipename: 1008eb8dc403SDave Cobbley localdata = rd.createCopy() 1009eb8dc403SDave Cobbley localdata.setVar('PN', newname) 1010eb8dc403SDave Cobbley newbpn = localdata.getVar('BPN') 1011eb8dc403SDave Cobbley else: 1012eb8dc403SDave Cobbley newbpn = bpn 1013eb8dc403SDave Cobbley s = rd.getVar('S', False) 1014eb8dc403SDave Cobbley src_uri = rd.getVar('SRC_URI', False) 1015eb8dc403SDave Cobbley pv = rd.getVar('PV') 1016eb8dc403SDave Cobbley 1017eb8dc403SDave Cobbley # Correct variable values that refer to the upstream source - these 1018eb8dc403SDave Cobbley # values must stay the same, so if the name/version are changing then 1019eb8dc403SDave Cobbley # we need to fix them up 1020eb8dc403SDave Cobbley new_s = s 1021eb8dc403SDave Cobbley new_src_uri = src_uri 1022eb8dc403SDave Cobbley if newbpn != bpn: 1023eb8dc403SDave Cobbley # ${PN} here is technically almost always incorrect, but people do use it 1024eb8dc403SDave Cobbley new_s = new_s.replace('${BPN}', bpn) 1025eb8dc403SDave Cobbley new_s = new_s.replace('${PN}', bpn) 1026eb8dc403SDave Cobbley new_s = new_s.replace('${BP}', '%s-${PV}' % bpn) 1027eb8dc403SDave Cobbley new_src_uri = new_src_uri.replace('${BPN}', bpn) 1028eb8dc403SDave Cobbley new_src_uri = new_src_uri.replace('${PN}', bpn) 1029eb8dc403SDave Cobbley new_src_uri = new_src_uri.replace('${BP}', '%s-${PV}' % bpn) 1030eb8dc403SDave Cobbley if args.version and origfnver == pv: 1031eb8dc403SDave Cobbley new_s = new_s.replace('${PV}', pv) 1032eb8dc403SDave Cobbley new_s = new_s.replace('${BP}', '${BPN}-%s' % pv) 1033eb8dc403SDave Cobbley new_src_uri = new_src_uri.replace('${PV}', pv) 1034eb8dc403SDave Cobbley new_src_uri = new_src_uri.replace('${BP}', '${BPN}-%s' % pv) 1035eb8dc403SDave Cobbley patchfields = {} 1036eb8dc403SDave Cobbley if new_s != s: 1037eb8dc403SDave Cobbley patchfields['S'] = new_s 1038eb8dc403SDave Cobbley if new_src_uri != src_uri: 1039eb8dc403SDave Cobbley patchfields['SRC_URI'] = new_src_uri 1040eb8dc403SDave Cobbley if patchfields: 1041eb8dc403SDave Cobbley recipefilemd5 = bb.utils.md5_file(recipefile) 1042eb8dc403SDave Cobbley oe.recipeutils.patch_recipe(rd, recipefile, patchfields) 1043eb8dc403SDave Cobbley newrecipefilemd5 = bb.utils.md5_file(recipefile) 1044eb8dc403SDave Cobbley finally: 1045eb8dc403SDave Cobbley tinfoil.shutdown() 1046eb8dc403SDave Cobbley 1047eb8dc403SDave Cobbley if args.version: 1048eb8dc403SDave Cobbley newver = args.version 1049eb8dc403SDave Cobbley else: 1050eb8dc403SDave Cobbley newver = origfnver 1051eb8dc403SDave Cobbley 1052eb8dc403SDave Cobbley if newver: 1053eb8dc403SDave Cobbley newappend = '%s_%s.bbappend' % (newname, newver) 1054eb8dc403SDave Cobbley newfile = '%s_%s.bb' % (newname, newver) 1055eb8dc403SDave Cobbley else: 1056eb8dc403SDave Cobbley newappend = '%s.bbappend' % newname 1057eb8dc403SDave Cobbley newfile = '%s.bb' % newname 1058eb8dc403SDave Cobbley 1059eb8dc403SDave Cobbley oldrecipedir = os.path.dirname(recipefile) 1060eb8dc403SDave Cobbley newrecipedir = os.path.join(config.workspace_path, 'recipes', newname) 1061eb8dc403SDave Cobbley if oldrecipedir != newrecipedir: 1062eb8dc403SDave Cobbley bb.utils.mkdirhier(newrecipedir) 1063eb8dc403SDave Cobbley 1064eb8dc403SDave Cobbley newappend = os.path.join(os.path.dirname(append), newappend) 1065eb8dc403SDave Cobbley newfile = os.path.join(newrecipedir, newfile) 1066eb8dc403SDave Cobbley 1067eb8dc403SDave Cobbley # Rename bbappend 1068eb8dc403SDave Cobbley logger.info('Renaming %s to %s' % (append, newappend)) 1069eb8dc403SDave Cobbley os.rename(append, newappend) 1070eb8dc403SDave Cobbley # Rename recipe file 1071eb8dc403SDave Cobbley logger.info('Renaming %s to %s' % (recipefile, newfile)) 1072eb8dc403SDave Cobbley os.rename(recipefile, newfile) 1073eb8dc403SDave Cobbley 1074eb8dc403SDave Cobbley # Rename source tree if it's the default path 1075eb8dc403SDave Cobbley appendmd5 = None 1076eb8dc403SDave Cobbley if not args.no_srctree: 1077eb8dc403SDave Cobbley srctree = workspace[args.recipename]['srctree'] 1078eb8dc403SDave Cobbley if os.path.abspath(srctree) == os.path.join(config.workspace_path, 'sources', args.recipename): 1079eb8dc403SDave Cobbley newsrctree = os.path.join(config.workspace_path, 'sources', newname) 1080eb8dc403SDave Cobbley logger.info('Renaming %s to %s' % (srctree, newsrctree)) 1081eb8dc403SDave Cobbley shutil.move(srctree, newsrctree) 1082eb8dc403SDave Cobbley # Correct any references (basically EXTERNALSRC*) in the .bbappend 1083eb8dc403SDave Cobbley appendmd5 = bb.utils.md5_file(newappend) 1084eb8dc403SDave Cobbley appendlines = [] 1085eb8dc403SDave Cobbley with open(newappend, 'r') as f: 1086eb8dc403SDave Cobbley for line in f: 1087eb8dc403SDave Cobbley appendlines.append(line) 1088eb8dc403SDave Cobbley with open(newappend, 'w') as f: 1089eb8dc403SDave Cobbley for line in appendlines: 1090eb8dc403SDave Cobbley if srctree in line: 1091eb8dc403SDave Cobbley line = line.replace(srctree, newsrctree) 1092eb8dc403SDave Cobbley f.write(line) 1093eb8dc403SDave Cobbley newappendmd5 = bb.utils.md5_file(newappend) 1094eb8dc403SDave Cobbley 1095eb8dc403SDave Cobbley bpndir = None 1096eb8dc403SDave Cobbley newbpndir = None 1097eb8dc403SDave Cobbley if newbpn != bpn: 1098eb8dc403SDave Cobbley bpndir = os.path.join(oldrecipedir, bpn) 1099eb8dc403SDave Cobbley if os.path.exists(bpndir): 1100eb8dc403SDave Cobbley newbpndir = os.path.join(newrecipedir, newbpn) 1101eb8dc403SDave Cobbley logger.info('Renaming %s to %s' % (bpndir, newbpndir)) 1102eb8dc403SDave Cobbley shutil.move(bpndir, newbpndir) 1103eb8dc403SDave Cobbley 1104eb8dc403SDave Cobbley bpdir = None 1105eb8dc403SDave Cobbley newbpdir = None 1106eb8dc403SDave Cobbley if newver != origfnver or newbpn != bpn: 1107eb8dc403SDave Cobbley bpdir = os.path.join(oldrecipedir, bp) 1108eb8dc403SDave Cobbley if os.path.exists(bpdir): 1109eb8dc403SDave Cobbley newbpdir = os.path.join(newrecipedir, '%s-%s' % (newbpn, newver)) 1110eb8dc403SDave Cobbley logger.info('Renaming %s to %s' % (bpdir, newbpdir)) 1111eb8dc403SDave Cobbley shutil.move(bpdir, newbpdir) 1112eb8dc403SDave Cobbley 1113eb8dc403SDave Cobbley if oldrecipedir != newrecipedir: 1114eb8dc403SDave Cobbley # Move any stray files and delete the old recipe directory 1115eb8dc403SDave Cobbley for entry in os.listdir(oldrecipedir): 1116eb8dc403SDave Cobbley oldpath = os.path.join(oldrecipedir, entry) 1117eb8dc403SDave Cobbley newpath = os.path.join(newrecipedir, entry) 1118eb8dc403SDave Cobbley logger.info('Renaming %s to %s' % (oldpath, newpath)) 1119eb8dc403SDave Cobbley shutil.move(oldpath, newpath) 1120eb8dc403SDave Cobbley os.rmdir(oldrecipedir) 1121eb8dc403SDave Cobbley 1122eb8dc403SDave Cobbley # Now take care of entries in .devtool_md5 1123eb8dc403SDave Cobbley md5entries = [] 1124eb8dc403SDave Cobbley with open(os.path.join(config.workspace_path, '.devtool_md5'), 'r') as f: 1125eb8dc403SDave Cobbley for line in f: 1126eb8dc403SDave Cobbley md5entries.append(line) 1127eb8dc403SDave Cobbley 1128eb8dc403SDave Cobbley if bpndir and newbpndir: 1129eb8dc403SDave Cobbley relbpndir = os.path.relpath(bpndir, config.workspace_path) + '/' 1130eb8dc403SDave Cobbley else: 1131eb8dc403SDave Cobbley relbpndir = None 1132eb8dc403SDave Cobbley if bpdir and newbpdir: 1133eb8dc403SDave Cobbley relbpdir = os.path.relpath(bpdir, config.workspace_path) + '/' 1134eb8dc403SDave Cobbley else: 1135eb8dc403SDave Cobbley relbpdir = None 1136eb8dc403SDave Cobbley 1137eb8dc403SDave Cobbley with open(os.path.join(config.workspace_path, '.devtool_md5'), 'w') as f: 1138eb8dc403SDave Cobbley for entry in md5entries: 1139eb8dc403SDave Cobbley splitentry = entry.rstrip().split('|') 1140eb8dc403SDave Cobbley if len(splitentry) > 2: 1141eb8dc403SDave Cobbley if splitentry[0] == args.recipename: 1142eb8dc403SDave Cobbley splitentry[0] = newname 1143eb8dc403SDave Cobbley if splitentry[1] == os.path.relpath(append, config.workspace_path): 1144eb8dc403SDave Cobbley splitentry[1] = os.path.relpath(newappend, config.workspace_path) 1145eb8dc403SDave Cobbley if appendmd5 and splitentry[2] == appendmd5: 1146eb8dc403SDave Cobbley splitentry[2] = newappendmd5 1147eb8dc403SDave Cobbley elif splitentry[1] == os.path.relpath(recipefile, config.workspace_path): 1148eb8dc403SDave Cobbley splitentry[1] = os.path.relpath(newfile, config.workspace_path) 1149eb8dc403SDave Cobbley if recipefilemd5 and splitentry[2] == recipefilemd5: 1150eb8dc403SDave Cobbley splitentry[2] = newrecipefilemd5 1151eb8dc403SDave Cobbley elif relbpndir and splitentry[1].startswith(relbpndir): 1152eb8dc403SDave Cobbley splitentry[1] = os.path.relpath(os.path.join(newbpndir, splitentry[1][len(relbpndir):]), config.workspace_path) 1153eb8dc403SDave Cobbley elif relbpdir and splitentry[1].startswith(relbpdir): 1154eb8dc403SDave Cobbley splitentry[1] = os.path.relpath(os.path.join(newbpdir, splitentry[1][len(relbpdir):]), config.workspace_path) 1155eb8dc403SDave Cobbley entry = '|'.join(splitentry) + '\n' 1156eb8dc403SDave Cobbley f.write(entry) 1157eb8dc403SDave Cobbley return 0 1158eb8dc403SDave Cobbley 1159eb8dc403SDave Cobbley 1160eb8dc403SDave Cobbleydef _get_patchset_revs(srctree, recipe_path, initial_rev=None, force_patch_refresh=False): 1161eb8dc403SDave Cobbley """Get initial and update rev of a recipe. These are the start point of the 1162eb8dc403SDave Cobbley whole patchset and start point for the patches to be re-generated/updated. 1163eb8dc403SDave Cobbley """ 1164eb8dc403SDave Cobbley import bb 1165eb8dc403SDave Cobbley 1166eb8dc403SDave Cobbley # Get current branch 1167eb8dc403SDave Cobbley stdout, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', 1168eb8dc403SDave Cobbley cwd=srctree) 1169eb8dc403SDave Cobbley branchname = stdout.rstrip() 1170eb8dc403SDave Cobbley 1171eb8dc403SDave Cobbley # Parse initial rev from recipe if not specified 1172eb8dc403SDave Cobbley commits = [] 1173eb8dc403SDave Cobbley patches = [] 1174eb8dc403SDave Cobbley with open(recipe_path, 'r') as f: 1175eb8dc403SDave Cobbley for line in f: 1176eb8dc403SDave Cobbley if line.startswith('# initial_rev:'): 1177eb8dc403SDave Cobbley if not initial_rev: 1178eb8dc403SDave Cobbley initial_rev = line.split(':')[-1].strip() 1179eb8dc403SDave Cobbley elif line.startswith('# commit:') and not force_patch_refresh: 1180eb8dc403SDave Cobbley commits.append(line.split(':')[-1].strip()) 1181eb8dc403SDave Cobbley elif line.startswith('# patches_%s:' % branchname): 1182eb8dc403SDave Cobbley patches = line.split(':')[-1].strip().split(',') 1183eb8dc403SDave Cobbley 1184eb8dc403SDave Cobbley update_rev = initial_rev 1185eb8dc403SDave Cobbley changed_revs = None 1186eb8dc403SDave Cobbley if initial_rev: 1187eb8dc403SDave Cobbley # Find first actually changed revision 1188eb8dc403SDave Cobbley stdout, _ = bb.process.run('git rev-list --reverse %s..HEAD' % 1189eb8dc403SDave Cobbley initial_rev, cwd=srctree) 1190eb8dc403SDave Cobbley newcommits = stdout.split() 1191eb8dc403SDave Cobbley for i in range(min(len(commits), len(newcommits))): 1192eb8dc403SDave Cobbley if newcommits[i] == commits[i]: 1193eb8dc403SDave Cobbley update_rev = commits[i] 1194eb8dc403SDave Cobbley 1195eb8dc403SDave Cobbley try: 1196eb8dc403SDave Cobbley stdout, _ = bb.process.run('git cherry devtool-patched', 1197eb8dc403SDave Cobbley cwd=srctree) 1198eb8dc403SDave Cobbley except bb.process.ExecutionError as err: 1199eb8dc403SDave Cobbley stdout = None 1200eb8dc403SDave Cobbley 1201eb8dc403SDave Cobbley if stdout is not None and not force_patch_refresh: 1202eb8dc403SDave Cobbley changed_revs = [] 1203eb8dc403SDave Cobbley for line in stdout.splitlines(): 1204eb8dc403SDave Cobbley if line.startswith('+ '): 1205eb8dc403SDave Cobbley rev = line.split()[1] 1206eb8dc403SDave Cobbley if rev in newcommits: 1207eb8dc403SDave Cobbley changed_revs.append(rev) 1208eb8dc403SDave Cobbley 1209eb8dc403SDave Cobbley return initial_rev, update_rev, changed_revs, patches 1210eb8dc403SDave Cobbley 1211eb8dc403SDave Cobbleydef _remove_file_entries(srcuri, filelist): 1212eb8dc403SDave Cobbley """Remove file:// entries from SRC_URI""" 1213eb8dc403SDave Cobbley remaining = filelist[:] 1214eb8dc403SDave Cobbley entries = [] 1215eb8dc403SDave Cobbley for fname in filelist: 1216eb8dc403SDave Cobbley basename = os.path.basename(fname) 1217eb8dc403SDave Cobbley for i in range(len(srcuri)): 1218eb8dc403SDave Cobbley if (srcuri[i].startswith('file://') and 1219eb8dc403SDave Cobbley os.path.basename(srcuri[i].split(';')[0]) == basename): 1220eb8dc403SDave Cobbley entries.append(srcuri[i]) 1221eb8dc403SDave Cobbley remaining.remove(fname) 1222eb8dc403SDave Cobbley srcuri.pop(i) 1223eb8dc403SDave Cobbley break 1224eb8dc403SDave Cobbley return entries, remaining 1225eb8dc403SDave Cobbley 1226eb8dc403SDave Cobbleydef _replace_srcuri_entry(srcuri, filename, newentry): 1227eb8dc403SDave Cobbley """Replace entry corresponding to specified file with a new entry""" 1228eb8dc403SDave Cobbley basename = os.path.basename(filename) 1229eb8dc403SDave Cobbley for i in range(len(srcuri)): 1230eb8dc403SDave Cobbley if os.path.basename(srcuri[i].split(';')[0]) == basename: 1231eb8dc403SDave Cobbley srcuri.pop(i) 1232eb8dc403SDave Cobbley srcuri.insert(i, newentry) 1233eb8dc403SDave Cobbley break 1234eb8dc403SDave Cobbley 1235eb8dc403SDave Cobbleydef _remove_source_files(append, files, destpath, no_report_remove=False, dry_run=False): 1236eb8dc403SDave Cobbley """Unlink existing patch files""" 1237eb8dc403SDave Cobbley 1238eb8dc403SDave Cobbley dry_run_suffix = ' (dry-run)' if dry_run else '' 1239eb8dc403SDave Cobbley 1240eb8dc403SDave Cobbley for path in files: 1241eb8dc403SDave Cobbley if append: 1242eb8dc403SDave Cobbley if not destpath: 1243eb8dc403SDave Cobbley raise Exception('destpath should be set here') 1244eb8dc403SDave Cobbley path = os.path.join(destpath, os.path.basename(path)) 1245eb8dc403SDave Cobbley 1246eb8dc403SDave Cobbley if os.path.exists(path): 1247eb8dc403SDave Cobbley if not no_report_remove: 1248eb8dc403SDave Cobbley logger.info('Removing file %s%s' % (path, dry_run_suffix)) 1249eb8dc403SDave Cobbley if not dry_run: 1250eb8dc403SDave Cobbley # FIXME "git rm" here would be nice if the file in question is 1251eb8dc403SDave Cobbley # tracked 1252eb8dc403SDave Cobbley # FIXME there's a chance that this file is referred to by 1253eb8dc403SDave Cobbley # another recipe, in which case deleting wouldn't be the 1254eb8dc403SDave Cobbley # right thing to do 1255eb8dc403SDave Cobbley os.remove(path) 1256eb8dc403SDave Cobbley # Remove directory if empty 1257eb8dc403SDave Cobbley try: 1258eb8dc403SDave Cobbley os.rmdir(os.path.dirname(path)) 1259eb8dc403SDave Cobbley except OSError as ose: 1260eb8dc403SDave Cobbley if ose.errno != errno.ENOTEMPTY: 1261eb8dc403SDave Cobbley raise 1262eb8dc403SDave Cobbley 1263eb8dc403SDave Cobbley 1264eb8dc403SDave Cobbleydef _export_patches(srctree, rd, start_rev, destdir, changed_revs=None): 1265eb8dc403SDave Cobbley """Export patches from srctree to given location. 1266eb8dc403SDave Cobbley Returns three-tuple of dicts: 1267eb8dc403SDave Cobbley 1. updated - patches that already exist in SRCURI 1268eb8dc403SDave Cobbley 2. added - new patches that don't exist in SRCURI 1269eb8dc403SDave Cobbley 3 removed - patches that exist in SRCURI but not in exported patches 1270eb8dc403SDave Cobbley In each dict the key is the 'basepath' of the URI and value is the 1271eb8dc403SDave Cobbley absolute path to the existing file in recipe space (if any). 1272eb8dc403SDave Cobbley """ 1273eb8dc403SDave Cobbley import oe.recipeutils 1274eb8dc403SDave Cobbley from oe.patch import GitApplyTree 1275eb8dc403SDave Cobbley updated = OrderedDict() 1276eb8dc403SDave Cobbley added = OrderedDict() 1277eb8dc403SDave Cobbley seqpatch_re = re.compile('^([0-9]{4}-)?(.+)') 1278eb8dc403SDave Cobbley 1279eb8dc403SDave Cobbley existing_patches = dict((os.path.basename(path), path) for path in 1280eb8dc403SDave Cobbley oe.recipeutils.get_recipe_patches(rd)) 1281eb8dc403SDave Cobbley logger.debug('Existing patches: %s' % existing_patches) 1282eb8dc403SDave Cobbley 1283eb8dc403SDave Cobbley # Generate patches from Git, exclude local files directory 1284eb8dc403SDave Cobbley patch_pathspec = _git_exclude_path(srctree, 'oe-local-files') 1285eb8dc403SDave Cobbley GitApplyTree.extractPatches(srctree, start_rev, destdir, patch_pathspec) 1286eb8dc403SDave Cobbley 1287eb8dc403SDave Cobbley new_patches = sorted(os.listdir(destdir)) 1288eb8dc403SDave Cobbley for new_patch in new_patches: 1289eb8dc403SDave Cobbley # Strip numbering from patch names. If it's a git sequence named patch, 1290eb8dc403SDave Cobbley # the numbers might not match up since we are starting from a different 1291eb8dc403SDave Cobbley # revision This does assume that people are using unique shortlog 1292eb8dc403SDave Cobbley # values, but they ought to be anyway... 1293eb8dc403SDave Cobbley new_basename = seqpatch_re.match(new_patch).group(2) 1294eb8dc403SDave Cobbley match_name = None 1295eb8dc403SDave Cobbley for old_patch in existing_patches: 1296eb8dc403SDave Cobbley old_basename = seqpatch_re.match(old_patch).group(2) 1297eb8dc403SDave Cobbley old_basename_splitext = os.path.splitext(old_basename) 1298eb8dc403SDave Cobbley if old_basename.endswith(('.gz', '.bz2', '.Z')) and old_basename_splitext[0] == new_basename: 1299eb8dc403SDave Cobbley old_patch_noext = os.path.splitext(old_patch)[0] 1300eb8dc403SDave Cobbley match_name = old_patch_noext 1301eb8dc403SDave Cobbley break 1302eb8dc403SDave Cobbley elif new_basename == old_basename: 1303eb8dc403SDave Cobbley match_name = old_patch 1304eb8dc403SDave Cobbley break 1305eb8dc403SDave Cobbley if match_name: 1306eb8dc403SDave Cobbley # Rename patch files 1307eb8dc403SDave Cobbley if new_patch != match_name: 1308eb8dc403SDave Cobbley os.rename(os.path.join(destdir, new_patch), 1309eb8dc403SDave Cobbley os.path.join(destdir, match_name)) 1310eb8dc403SDave Cobbley # Need to pop it off the list now before checking changed_revs 1311eb8dc403SDave Cobbley oldpath = existing_patches.pop(old_patch) 1312eb8dc403SDave Cobbley if changed_revs is not None: 1313eb8dc403SDave Cobbley # Avoid updating patches that have not actually changed 1314eb8dc403SDave Cobbley with open(os.path.join(destdir, match_name), 'r') as f: 1315eb8dc403SDave Cobbley firstlineitems = f.readline().split() 1316eb8dc403SDave Cobbley # Looking for "From <hash>" line 1317eb8dc403SDave Cobbley if len(firstlineitems) > 1 and len(firstlineitems[1]) == 40: 1318eb8dc403SDave Cobbley if not firstlineitems[1] in changed_revs: 1319eb8dc403SDave Cobbley continue 1320eb8dc403SDave Cobbley # Recompress if necessary 1321eb8dc403SDave Cobbley if oldpath.endswith(('.gz', '.Z')): 1322eb8dc403SDave Cobbley bb.process.run(['gzip', match_name], cwd=destdir) 1323eb8dc403SDave Cobbley if oldpath.endswith('.gz'): 1324eb8dc403SDave Cobbley match_name += '.gz' 1325eb8dc403SDave Cobbley else: 1326eb8dc403SDave Cobbley match_name += '.Z' 1327eb8dc403SDave Cobbley elif oldpath.endswith('.bz2'): 1328eb8dc403SDave Cobbley bb.process.run(['bzip2', match_name], cwd=destdir) 1329eb8dc403SDave Cobbley match_name += '.bz2' 1330eb8dc403SDave Cobbley updated[match_name] = oldpath 1331eb8dc403SDave Cobbley else: 1332eb8dc403SDave Cobbley added[new_patch] = None 1333eb8dc403SDave Cobbley return (updated, added, existing_patches) 1334eb8dc403SDave Cobbley 1335eb8dc403SDave Cobbley 1336eb8dc403SDave Cobbleydef _create_kconfig_diff(srctree, rd, outfile): 1337eb8dc403SDave Cobbley """Create a kconfig fragment""" 1338eb8dc403SDave Cobbley # Only update config fragment if both config files exist 1339eb8dc403SDave Cobbley orig_config = os.path.join(srctree, '.config.baseline') 1340eb8dc403SDave Cobbley new_config = os.path.join(srctree, '.config.new') 1341eb8dc403SDave Cobbley if os.path.exists(orig_config) and os.path.exists(new_config): 1342eb8dc403SDave Cobbley cmd = ['diff', '--new-line-format=%L', '--old-line-format=', 1343eb8dc403SDave Cobbley '--unchanged-line-format=', orig_config, new_config] 1344eb8dc403SDave Cobbley pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, 1345eb8dc403SDave Cobbley stderr=subprocess.PIPE) 1346eb8dc403SDave Cobbley stdout, stderr = pipe.communicate() 1347eb8dc403SDave Cobbley if pipe.returncode == 1: 1348eb8dc403SDave Cobbley logger.info("Updating config fragment %s" % outfile) 1349eb8dc403SDave Cobbley with open(outfile, 'wb') as fobj: 1350eb8dc403SDave Cobbley fobj.write(stdout) 1351eb8dc403SDave Cobbley elif pipe.returncode == 0: 1352eb8dc403SDave Cobbley logger.info("Would remove config fragment %s" % outfile) 1353eb8dc403SDave Cobbley if os.path.exists(outfile): 1354eb8dc403SDave Cobbley # Remove fragment file in case of empty diff 1355eb8dc403SDave Cobbley logger.info("Removing config fragment %s" % outfile) 1356eb8dc403SDave Cobbley os.unlink(outfile) 1357eb8dc403SDave Cobbley else: 1358eb8dc403SDave Cobbley raise bb.process.ExecutionError(cmd, pipe.returncode, stdout, stderr) 1359eb8dc403SDave Cobbley return True 1360eb8dc403SDave Cobbley return False 1361eb8dc403SDave Cobbley 1362eb8dc403SDave Cobbley 1363eb8dc403SDave Cobbleydef _export_local_files(srctree, rd, destdir, srctreebase): 1364eb8dc403SDave Cobbley """Copy local files from srctree to given location. 1365eb8dc403SDave Cobbley Returns three-tuple of dicts: 1366eb8dc403SDave Cobbley 1. updated - files that already exist in SRCURI 1367eb8dc403SDave Cobbley 2. added - new files files that don't exist in SRCURI 1368eb8dc403SDave Cobbley 3 removed - files that exist in SRCURI but not in exported files 1369eb8dc403SDave Cobbley In each dict the key is the 'basepath' of the URI and value is the 1370eb8dc403SDave Cobbley absolute path to the existing file in recipe space (if any). 1371eb8dc403SDave Cobbley """ 1372eb8dc403SDave Cobbley import oe.recipeutils 1373eb8dc403SDave Cobbley 1374eb8dc403SDave Cobbley # Find out local files (SRC_URI files that exist in the "recipe space"). 1375eb8dc403SDave Cobbley # Local files that reside in srctree are not included in patch generation. 1376eb8dc403SDave Cobbley # Instead they are directly copied over the original source files (in 1377eb8dc403SDave Cobbley # recipe space). 1378eb8dc403SDave Cobbley existing_files = oe.recipeutils.get_recipe_local_files(rd) 1379eb8dc403SDave Cobbley new_set = None 1380eb8dc403SDave Cobbley updated = OrderedDict() 1381eb8dc403SDave Cobbley added = OrderedDict() 1382eb8dc403SDave Cobbley removed = OrderedDict() 1383eb8dc403SDave Cobbley local_files_dir = os.path.join(srctreebase, 'oe-local-files') 1384eb8dc403SDave Cobbley git_files = _git_ls_tree(srctree) 1385eb8dc403SDave Cobbley if 'oe-local-files' in git_files: 1386eb8dc403SDave Cobbley # If tracked by Git, take the files from srctree HEAD. First get 1387eb8dc403SDave Cobbley # the tree object of the directory 1388eb8dc403SDave Cobbley tmp_index = os.path.join(srctree, '.git', 'index.tmp.devtool') 1389eb8dc403SDave Cobbley tree = git_files['oe-local-files'][2] 1390eb8dc403SDave Cobbley bb.process.run(['git', 'checkout', tree, '--', '.'], cwd=srctree, 1391eb8dc403SDave Cobbley env=dict(os.environ, GIT_WORK_TREE=destdir, 1392eb8dc403SDave Cobbley GIT_INDEX_FILE=tmp_index)) 1393eb8dc403SDave Cobbley new_set = list(_git_ls_tree(srctree, tree, True).keys()) 1394eb8dc403SDave Cobbley elif os.path.isdir(local_files_dir): 1395eb8dc403SDave Cobbley # If not tracked by Git, just copy from working copy 1396eb8dc403SDave Cobbley new_set = _ls_tree(local_files_dir) 1397eb8dc403SDave Cobbley bb.process.run(['cp', '-ax', 1398eb8dc403SDave Cobbley os.path.join(local_files_dir, '.'), destdir]) 1399eb8dc403SDave Cobbley else: 1400eb8dc403SDave Cobbley new_set = [] 1401eb8dc403SDave Cobbley 1402eb8dc403SDave Cobbley # Special handling for kernel config 1403eb8dc403SDave Cobbley if bb.data.inherits_class('kernel-yocto', rd): 1404eb8dc403SDave Cobbley fragment_fn = 'devtool-fragment.cfg' 1405eb8dc403SDave Cobbley fragment_path = os.path.join(destdir, fragment_fn) 1406eb8dc403SDave Cobbley if _create_kconfig_diff(srctree, rd, fragment_path): 1407eb8dc403SDave Cobbley if os.path.exists(fragment_path): 1408eb8dc403SDave Cobbley if fragment_fn not in new_set: 1409eb8dc403SDave Cobbley new_set.append(fragment_fn) 1410eb8dc403SDave Cobbley # Copy fragment to local-files 1411eb8dc403SDave Cobbley if os.path.isdir(local_files_dir): 1412eb8dc403SDave Cobbley shutil.copy2(fragment_path, local_files_dir) 1413eb8dc403SDave Cobbley else: 1414eb8dc403SDave Cobbley if fragment_fn in new_set: 1415eb8dc403SDave Cobbley new_set.remove(fragment_fn) 1416eb8dc403SDave Cobbley # Remove fragment from local-files 1417eb8dc403SDave Cobbley if os.path.exists(os.path.join(local_files_dir, fragment_fn)): 1418eb8dc403SDave Cobbley os.unlink(os.path.join(local_files_dir, fragment_fn)) 1419eb8dc403SDave Cobbley 1420d89cb5f0SBrad Bishop # Special handling for cml1, ccmake, etc bbclasses that generated 1421d89cb5f0SBrad Bishop # configuration fragment files that are consumed as source files 1422d89cb5f0SBrad Bishop for frag_class, frag_name in [("cml1", "fragment.cfg"), ("ccmake", "site-file.cmake")]: 1423d89cb5f0SBrad Bishop if bb.data.inherits_class(frag_class, rd): 1424d89cb5f0SBrad Bishop srcpath = os.path.join(rd.getVar('WORKDIR'), frag_name) 1425d89cb5f0SBrad Bishop if os.path.exists(srcpath): 1426d89cb5f0SBrad Bishop if frag_name not in new_set: 1427d89cb5f0SBrad Bishop new_set.append(frag_name) 1428d89cb5f0SBrad Bishop # copy fragment into destdir 1429d89cb5f0SBrad Bishop shutil.copy2(srcpath, destdir) 1430d89cb5f0SBrad Bishop # copy fragment into local files if exists 1431d89cb5f0SBrad Bishop if os.path.isdir(local_files_dir): 1432d89cb5f0SBrad Bishop shutil.copy2(srcpath, local_files_dir) 1433d89cb5f0SBrad Bishop 1434eb8dc403SDave Cobbley if new_set is not None: 1435eb8dc403SDave Cobbley for fname in new_set: 1436eb8dc403SDave Cobbley if fname in existing_files: 1437eb8dc403SDave Cobbley origpath = existing_files.pop(fname) 1438eb8dc403SDave Cobbley workpath = os.path.join(local_files_dir, fname) 1439eb8dc403SDave Cobbley if not filecmp.cmp(origpath, workpath): 1440eb8dc403SDave Cobbley updated[fname] = origpath 1441eb8dc403SDave Cobbley elif fname != '.gitignore': 1442eb8dc403SDave Cobbley added[fname] = None 1443eb8dc403SDave Cobbley 1444eb8dc403SDave Cobbley workdir = rd.getVar('WORKDIR') 1445eb8dc403SDave Cobbley s = rd.getVar('S') 1446eb8dc403SDave Cobbley if not s.endswith(os.sep): 1447eb8dc403SDave Cobbley s += os.sep 1448eb8dc403SDave Cobbley 1449eb8dc403SDave Cobbley if workdir != s: 1450eb8dc403SDave Cobbley # Handle files where subdir= was specified 1451eb8dc403SDave Cobbley for fname in list(existing_files.keys()): 1452eb8dc403SDave Cobbley # FIXME handle both subdir starting with BP and not? 1453eb8dc403SDave Cobbley fworkpath = os.path.join(workdir, fname) 1454eb8dc403SDave Cobbley if fworkpath.startswith(s): 1455eb8dc403SDave Cobbley fpath = os.path.join(srctree, os.path.relpath(fworkpath, s)) 1456eb8dc403SDave Cobbley if os.path.exists(fpath): 1457eb8dc403SDave Cobbley origpath = existing_files.pop(fname) 1458eb8dc403SDave Cobbley if not filecmp.cmp(origpath, fpath): 1459eb8dc403SDave Cobbley updated[fpath] = origpath 1460eb8dc403SDave Cobbley 1461eb8dc403SDave Cobbley removed = existing_files 1462eb8dc403SDave Cobbley return (updated, added, removed) 1463eb8dc403SDave Cobbley 1464eb8dc403SDave Cobbley 1465eb8dc403SDave Cobbleydef _determine_files_dir(rd): 1466eb8dc403SDave Cobbley """Determine the appropriate files directory for a recipe""" 1467eb8dc403SDave Cobbley recipedir = rd.getVar('FILE_DIRNAME') 1468eb8dc403SDave Cobbley for entry in rd.getVar('FILESPATH').split(':'): 1469eb8dc403SDave Cobbley relpth = os.path.relpath(entry, recipedir) 1470eb8dc403SDave Cobbley if not os.sep in relpth: 1471eb8dc403SDave Cobbley # One (or zero) levels below only, so we don't put anything in machine-specific directories 1472eb8dc403SDave Cobbley if os.path.isdir(entry): 1473eb8dc403SDave Cobbley return entry 1474eb8dc403SDave Cobbley return os.path.join(recipedir, rd.getVar('BPN')) 1475eb8dc403SDave Cobbley 1476eb8dc403SDave Cobbley 1477eb8dc403SDave Cobbleydef _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wildcard_version, no_remove, no_report_remove, dry_run_outdir=None): 1478eb8dc403SDave Cobbley """Implement the 'srcrev' mode of update-recipe""" 1479eb8dc403SDave Cobbley import bb 1480eb8dc403SDave Cobbley import oe.recipeutils 1481eb8dc403SDave Cobbley 1482eb8dc403SDave Cobbley dry_run_suffix = ' (dry-run)' if dry_run_outdir else '' 1483eb8dc403SDave Cobbley 1484eb8dc403SDave Cobbley recipefile = rd.getVar('FILE') 1485eb8dc403SDave Cobbley recipedir = os.path.basename(recipefile) 1486eb8dc403SDave Cobbley logger.info('Updating SRCREV in recipe %s%s' % (recipedir, dry_run_suffix)) 1487eb8dc403SDave Cobbley 1488eb8dc403SDave Cobbley # Get HEAD revision 1489eb8dc403SDave Cobbley try: 1490eb8dc403SDave Cobbley stdout, _ = bb.process.run('git rev-parse HEAD', cwd=srctree) 1491eb8dc403SDave Cobbley except bb.process.ExecutionError as err: 1492eb8dc403SDave Cobbley raise DevtoolError('Failed to get HEAD revision in %s: %s' % 1493eb8dc403SDave Cobbley (srctree, err)) 1494eb8dc403SDave Cobbley srcrev = stdout.strip() 1495eb8dc403SDave Cobbley if len(srcrev) != 40: 1496eb8dc403SDave Cobbley raise DevtoolError('Invalid hash returned by git: %s' % stdout) 1497eb8dc403SDave Cobbley 1498eb8dc403SDave Cobbley destpath = None 1499eb8dc403SDave Cobbley remove_files = [] 1500eb8dc403SDave Cobbley patchfields = {} 1501eb8dc403SDave Cobbley patchfields['SRCREV'] = srcrev 1502eb8dc403SDave Cobbley orig_src_uri = rd.getVar('SRC_URI', False) or '' 1503eb8dc403SDave Cobbley srcuri = orig_src_uri.split() 1504eb8dc403SDave Cobbley tempdir = tempfile.mkdtemp(prefix='devtool') 1505eb8dc403SDave Cobbley update_srcuri = False 1506eb8dc403SDave Cobbley appendfile = None 1507eb8dc403SDave Cobbley try: 1508eb8dc403SDave Cobbley local_files_dir = tempfile.mkdtemp(dir=tempdir) 1509eb8dc403SDave Cobbley srctreebase = workspace[recipename]['srctreebase'] 1510eb8dc403SDave Cobbley upd_f, new_f, del_f = _export_local_files(srctree, rd, local_files_dir, srctreebase) 1511eb8dc403SDave Cobbley if not no_remove: 1512eb8dc403SDave Cobbley # Find list of existing patches in recipe file 1513eb8dc403SDave Cobbley patches_dir = tempfile.mkdtemp(dir=tempdir) 1514eb8dc403SDave Cobbley old_srcrev = rd.getVar('SRCREV') or '' 1515eb8dc403SDave Cobbley upd_p, new_p, del_p = _export_patches(srctree, rd, old_srcrev, 1516eb8dc403SDave Cobbley patches_dir) 1517eb8dc403SDave Cobbley logger.debug('Patches: update %s, new %s, delete %s' % (dict(upd_p), dict(new_p), dict(del_p))) 1518eb8dc403SDave Cobbley 1519eb8dc403SDave Cobbley # Remove deleted local files and "overlapping" patches 1520eb8dc403SDave Cobbley remove_files = list(del_f.values()) + list(upd_p.values()) + list(del_p.values()) 1521eb8dc403SDave Cobbley if remove_files: 1522eb8dc403SDave Cobbley removedentries = _remove_file_entries(srcuri, remove_files)[0] 1523eb8dc403SDave Cobbley update_srcuri = True 1524eb8dc403SDave Cobbley 1525eb8dc403SDave Cobbley if appendlayerdir: 1526eb8dc403SDave Cobbley files = dict((os.path.join(local_files_dir, key), val) for 1527eb8dc403SDave Cobbley key, val in list(upd_f.items()) + list(new_f.items())) 1528eb8dc403SDave Cobbley removevalues = {} 1529eb8dc403SDave Cobbley if update_srcuri: 1530eb8dc403SDave Cobbley removevalues = {'SRC_URI': removedentries} 1531eb8dc403SDave Cobbley patchfields['SRC_URI'] = '\\\n '.join(srcuri) 1532eb8dc403SDave Cobbley if dry_run_outdir: 1533eb8dc403SDave Cobbley logger.info('Creating bbappend (dry-run)') 1534eb8dc403SDave Cobbley else: 1535eb8dc403SDave Cobbley appendfile, destpath = oe.recipeutils.bbappend_recipe( 1536eb8dc403SDave Cobbley rd, appendlayerdir, files, wildcardver=wildcard_version, 1537eb8dc403SDave Cobbley extralines=patchfields, removevalues=removevalues, 1538eb8dc403SDave Cobbley redirect_output=dry_run_outdir) 1539eb8dc403SDave Cobbley else: 1540eb8dc403SDave Cobbley files_dir = _determine_files_dir(rd) 1541eb8dc403SDave Cobbley for basepath, path in upd_f.items(): 1542eb8dc403SDave Cobbley logger.info('Updating file %s%s' % (basepath, dry_run_suffix)) 1543eb8dc403SDave Cobbley if os.path.isabs(basepath): 1544eb8dc403SDave Cobbley # Original file (probably with subdir pointing inside source tree) 1545eb8dc403SDave Cobbley # so we do not want to move it, just copy 1546eb8dc403SDave Cobbley _copy_file(basepath, path, dry_run_outdir=dry_run_outdir, base_outdir=recipedir) 1547eb8dc403SDave Cobbley else: 1548eb8dc403SDave Cobbley _move_file(os.path.join(local_files_dir, basepath), path, 1549eb8dc403SDave Cobbley dry_run_outdir=dry_run_outdir, base_outdir=recipedir) 1550eb8dc403SDave Cobbley update_srcuri= True 1551eb8dc403SDave Cobbley for basepath, path in new_f.items(): 1552eb8dc403SDave Cobbley logger.info('Adding new file %s%s' % (basepath, dry_run_suffix)) 1553eb8dc403SDave Cobbley _move_file(os.path.join(local_files_dir, basepath), 1554eb8dc403SDave Cobbley os.path.join(files_dir, basepath), 1555eb8dc403SDave Cobbley dry_run_outdir=dry_run_outdir, 1556eb8dc403SDave Cobbley base_outdir=recipedir) 1557eb8dc403SDave Cobbley srcuri.append('file://%s' % basepath) 1558eb8dc403SDave Cobbley update_srcuri = True 1559eb8dc403SDave Cobbley if update_srcuri: 1560eb8dc403SDave Cobbley patchfields['SRC_URI'] = ' '.join(srcuri) 1561eb8dc403SDave Cobbley ret = oe.recipeutils.patch_recipe(rd, recipefile, patchfields, redirect_output=dry_run_outdir) 1562eb8dc403SDave Cobbley finally: 1563eb8dc403SDave Cobbley shutil.rmtree(tempdir) 1564eb8dc403SDave Cobbley if not 'git://' in orig_src_uri: 1565eb8dc403SDave Cobbley logger.info('You will need to update SRC_URI within the recipe to ' 1566eb8dc403SDave Cobbley 'point to a git repository where you have pushed your ' 1567eb8dc403SDave Cobbley 'changes') 1568eb8dc403SDave Cobbley 1569eb8dc403SDave Cobbley _remove_source_files(appendlayerdir, remove_files, destpath, no_report_remove, dry_run=dry_run_outdir) 1570eb8dc403SDave Cobbley return True, appendfile, remove_files 1571eb8dc403SDave Cobbley 1572eb8dc403SDave Cobbleydef _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wildcard_version, no_remove, no_report_remove, initial_rev, dry_run_outdir=None, force_patch_refresh=False): 1573eb8dc403SDave Cobbley """Implement the 'patch' mode of update-recipe""" 1574eb8dc403SDave Cobbley import bb 1575eb8dc403SDave Cobbley import oe.recipeutils 1576eb8dc403SDave Cobbley 1577eb8dc403SDave Cobbley recipefile = rd.getVar('FILE') 1578eb8dc403SDave Cobbley recipedir = os.path.dirname(recipefile) 1579eb8dc403SDave Cobbley append = workspace[recipename]['bbappend'] 1580eb8dc403SDave Cobbley if not os.path.exists(append): 1581eb8dc403SDave Cobbley raise DevtoolError('unable to find workspace bbappend for recipe %s' % 1582eb8dc403SDave Cobbley recipename) 1583eb8dc403SDave Cobbley 1584eb8dc403SDave Cobbley initial_rev, update_rev, changed_revs, filter_patches = _get_patchset_revs(srctree, append, initial_rev, force_patch_refresh) 1585eb8dc403SDave Cobbley if not initial_rev: 1586eb8dc403SDave Cobbley raise DevtoolError('Unable to find initial revision - please specify ' 1587eb8dc403SDave Cobbley 'it with --initial-rev') 1588eb8dc403SDave Cobbley 1589eb8dc403SDave Cobbley appendfile = None 1590eb8dc403SDave Cobbley dl_dir = rd.getVar('DL_DIR') 1591eb8dc403SDave Cobbley if not dl_dir.endswith('/'): 1592eb8dc403SDave Cobbley dl_dir += '/' 1593eb8dc403SDave Cobbley 1594eb8dc403SDave Cobbley dry_run_suffix = ' (dry-run)' if dry_run_outdir else '' 1595eb8dc403SDave Cobbley 1596eb8dc403SDave Cobbley tempdir = tempfile.mkdtemp(prefix='devtool') 1597eb8dc403SDave Cobbley try: 1598eb8dc403SDave Cobbley local_files_dir = tempfile.mkdtemp(dir=tempdir) 1599eb8dc403SDave Cobbley if filter_patches: 1600eb8dc403SDave Cobbley upd_f = {} 1601eb8dc403SDave Cobbley new_f = {} 1602eb8dc403SDave Cobbley del_f = {} 1603eb8dc403SDave Cobbley else: 1604eb8dc403SDave Cobbley srctreebase = workspace[recipename]['srctreebase'] 1605eb8dc403SDave Cobbley upd_f, new_f, del_f = _export_local_files(srctree, rd, local_files_dir, srctreebase) 1606eb8dc403SDave Cobbley 1607eb8dc403SDave Cobbley remove_files = [] 1608eb8dc403SDave Cobbley if not no_remove: 1609eb8dc403SDave Cobbley # Get all patches from source tree and check if any should be removed 1610eb8dc403SDave Cobbley all_patches_dir = tempfile.mkdtemp(dir=tempdir) 1611eb8dc403SDave Cobbley _, _, del_p = _export_patches(srctree, rd, initial_rev, 1612eb8dc403SDave Cobbley all_patches_dir) 1613eb8dc403SDave Cobbley # Remove deleted local files and patches 1614eb8dc403SDave Cobbley remove_files = list(del_f.values()) + list(del_p.values()) 1615eb8dc403SDave Cobbley 1616eb8dc403SDave Cobbley # Get updated patches from source tree 1617eb8dc403SDave Cobbley patches_dir = tempfile.mkdtemp(dir=tempdir) 1618eb8dc403SDave Cobbley upd_p, new_p, _ = _export_patches(srctree, rd, update_rev, 1619eb8dc403SDave Cobbley patches_dir, changed_revs) 1620eb8dc403SDave Cobbley logger.debug('Pre-filtering: update: %s, new: %s' % (dict(upd_p), dict(new_p))) 1621eb8dc403SDave Cobbley if filter_patches: 162200e122a7SBrad Bishop new_p = OrderedDict() 162300e122a7SBrad Bishop upd_p = OrderedDict((k,v) for k,v in upd_p.items() if k in filter_patches) 1624eb8dc403SDave Cobbley remove_files = [f for f in remove_files if f in filter_patches] 1625eb8dc403SDave Cobbley updatefiles = False 1626eb8dc403SDave Cobbley updaterecipe = False 1627eb8dc403SDave Cobbley destpath = None 1628eb8dc403SDave Cobbley srcuri = (rd.getVar('SRC_URI', False) or '').split() 1629eb8dc403SDave Cobbley if appendlayerdir: 163000e122a7SBrad Bishop files = OrderedDict((os.path.join(local_files_dir, key), val) for 1631eb8dc403SDave Cobbley key, val in list(upd_f.items()) + list(new_f.items())) 163200e122a7SBrad Bishop files.update(OrderedDict((os.path.join(patches_dir, key), val) for 1633eb8dc403SDave Cobbley key, val in list(upd_p.items()) + list(new_p.items()))) 1634eb8dc403SDave Cobbley if files or remove_files: 1635eb8dc403SDave Cobbley removevalues = None 1636eb8dc403SDave Cobbley if remove_files: 1637eb8dc403SDave Cobbley removedentries, remaining = _remove_file_entries( 1638eb8dc403SDave Cobbley srcuri, remove_files) 1639eb8dc403SDave Cobbley if removedentries or remaining: 1640eb8dc403SDave Cobbley remaining = ['file://' + os.path.basename(item) for 1641eb8dc403SDave Cobbley item in remaining] 1642eb8dc403SDave Cobbley removevalues = {'SRC_URI': removedentries + remaining} 1643eb8dc403SDave Cobbley appendfile, destpath = oe.recipeutils.bbappend_recipe( 1644eb8dc403SDave Cobbley rd, appendlayerdir, files, 1645eb8dc403SDave Cobbley wildcardver=wildcard_version, 1646eb8dc403SDave Cobbley removevalues=removevalues, 1647eb8dc403SDave Cobbley redirect_output=dry_run_outdir) 1648eb8dc403SDave Cobbley else: 1649eb8dc403SDave Cobbley logger.info('No patches or local source files needed updating') 1650eb8dc403SDave Cobbley else: 1651eb8dc403SDave Cobbley # Update existing files 1652eb8dc403SDave Cobbley files_dir = _determine_files_dir(rd) 1653eb8dc403SDave Cobbley for basepath, path in upd_f.items(): 1654eb8dc403SDave Cobbley logger.info('Updating file %s' % basepath) 1655eb8dc403SDave Cobbley if os.path.isabs(basepath): 1656eb8dc403SDave Cobbley # Original file (probably with subdir pointing inside source tree) 1657eb8dc403SDave Cobbley # so we do not want to move it, just copy 1658eb8dc403SDave Cobbley _copy_file(basepath, path, 1659eb8dc403SDave Cobbley dry_run_outdir=dry_run_outdir, base_outdir=recipedir) 1660eb8dc403SDave Cobbley else: 1661eb8dc403SDave Cobbley _move_file(os.path.join(local_files_dir, basepath), path, 1662eb8dc403SDave Cobbley dry_run_outdir=dry_run_outdir, base_outdir=recipedir) 1663eb8dc403SDave Cobbley updatefiles = True 1664eb8dc403SDave Cobbley for basepath, path in upd_p.items(): 1665eb8dc403SDave Cobbley patchfn = os.path.join(patches_dir, basepath) 1666eb8dc403SDave Cobbley if os.path.dirname(path) + '/' == dl_dir: 1667eb8dc403SDave Cobbley # This is a a downloaded patch file - we now need to 1668eb8dc403SDave Cobbley # replace the entry in SRC_URI with our local version 1669eb8dc403SDave Cobbley logger.info('Replacing remote patch %s with updated local version' % basepath) 1670eb8dc403SDave Cobbley path = os.path.join(files_dir, basepath) 1671eb8dc403SDave Cobbley _replace_srcuri_entry(srcuri, basepath, 'file://%s' % basepath) 1672eb8dc403SDave Cobbley updaterecipe = True 1673eb8dc403SDave Cobbley else: 1674eb8dc403SDave Cobbley logger.info('Updating patch %s%s' % (basepath, dry_run_suffix)) 1675eb8dc403SDave Cobbley _move_file(patchfn, path, 1676eb8dc403SDave Cobbley dry_run_outdir=dry_run_outdir, base_outdir=recipedir) 1677eb8dc403SDave Cobbley updatefiles = True 1678eb8dc403SDave Cobbley # Add any new files 1679eb8dc403SDave Cobbley for basepath, path in new_f.items(): 1680eb8dc403SDave Cobbley logger.info('Adding new file %s%s' % (basepath, dry_run_suffix)) 1681eb8dc403SDave Cobbley _move_file(os.path.join(local_files_dir, basepath), 1682eb8dc403SDave Cobbley os.path.join(files_dir, basepath), 1683eb8dc403SDave Cobbley dry_run_outdir=dry_run_outdir, 1684eb8dc403SDave Cobbley base_outdir=recipedir) 1685eb8dc403SDave Cobbley srcuri.append('file://%s' % basepath) 1686eb8dc403SDave Cobbley updaterecipe = True 1687eb8dc403SDave Cobbley for basepath, path in new_p.items(): 1688eb8dc403SDave Cobbley logger.info('Adding new patch %s%s' % (basepath, dry_run_suffix)) 1689eb8dc403SDave Cobbley _move_file(os.path.join(patches_dir, basepath), 1690eb8dc403SDave Cobbley os.path.join(files_dir, basepath), 1691eb8dc403SDave Cobbley dry_run_outdir=dry_run_outdir, 1692eb8dc403SDave Cobbley base_outdir=recipedir) 1693eb8dc403SDave Cobbley srcuri.append('file://%s' % basepath) 1694eb8dc403SDave Cobbley updaterecipe = True 1695eb8dc403SDave Cobbley # Update recipe, if needed 1696eb8dc403SDave Cobbley if _remove_file_entries(srcuri, remove_files)[0]: 1697eb8dc403SDave Cobbley updaterecipe = True 1698eb8dc403SDave Cobbley if updaterecipe: 1699eb8dc403SDave Cobbley if not dry_run_outdir: 1700eb8dc403SDave Cobbley logger.info('Updating recipe %s' % os.path.basename(recipefile)) 1701eb8dc403SDave Cobbley ret = oe.recipeutils.patch_recipe(rd, recipefile, 1702eb8dc403SDave Cobbley {'SRC_URI': ' '.join(srcuri)}, 1703eb8dc403SDave Cobbley redirect_output=dry_run_outdir) 1704eb8dc403SDave Cobbley elif not updatefiles: 1705eb8dc403SDave Cobbley # Neither patches nor recipe were updated 1706eb8dc403SDave Cobbley logger.info('No patches or files need updating') 1707eb8dc403SDave Cobbley return False, None, [] 1708eb8dc403SDave Cobbley finally: 1709eb8dc403SDave Cobbley shutil.rmtree(tempdir) 1710eb8dc403SDave Cobbley 1711eb8dc403SDave Cobbley _remove_source_files(appendlayerdir, remove_files, destpath, no_report_remove, dry_run=dry_run_outdir) 1712eb8dc403SDave Cobbley return True, appendfile, remove_files 1713eb8dc403SDave Cobbley 1714eb8dc403SDave Cobbleydef _guess_recipe_update_mode(srctree, rdata): 1715eb8dc403SDave Cobbley """Guess the recipe update mode to use""" 1716eb8dc403SDave Cobbley src_uri = (rdata.getVar('SRC_URI', False) or '').split() 1717eb8dc403SDave Cobbley git_uris = [uri for uri in src_uri if uri.startswith('git://')] 1718eb8dc403SDave Cobbley if not git_uris: 1719eb8dc403SDave Cobbley return 'patch' 1720eb8dc403SDave Cobbley # Just use the first URI for now 1721eb8dc403SDave Cobbley uri = git_uris[0] 1722eb8dc403SDave Cobbley # Check remote branch 1723eb8dc403SDave Cobbley params = bb.fetch.decodeurl(uri)[5] 1724eb8dc403SDave Cobbley upstr_branch = params['branch'] if 'branch' in params else 'master' 1725eb8dc403SDave Cobbley # Check if current branch HEAD is found in upstream branch 1726eb8dc403SDave Cobbley stdout, _ = bb.process.run('git rev-parse HEAD', cwd=srctree) 1727eb8dc403SDave Cobbley head_rev = stdout.rstrip() 1728eb8dc403SDave Cobbley stdout, _ = bb.process.run('git branch -r --contains %s' % head_rev, 1729eb8dc403SDave Cobbley cwd=srctree) 1730eb8dc403SDave Cobbley remote_brs = [branch.strip() for branch in stdout.splitlines()] 1731eb8dc403SDave Cobbley if 'origin/' + upstr_branch in remote_brs: 1732eb8dc403SDave Cobbley return 'srcrev' 1733eb8dc403SDave Cobbley 1734eb8dc403SDave Cobbley return 'patch' 1735eb8dc403SDave Cobbley 1736eb8dc403SDave Cobbleydef _update_recipe(recipename, workspace, rd, mode, appendlayerdir, wildcard_version, no_remove, initial_rev, no_report_remove=False, dry_run_outdir=None, no_overrides=False, force_patch_refresh=False): 1737eb8dc403SDave Cobbley srctree = workspace[recipename]['srctree'] 1738eb8dc403SDave Cobbley if mode == 'auto': 1739eb8dc403SDave Cobbley mode = _guess_recipe_update_mode(srctree, rd) 1740eb8dc403SDave Cobbley 1741eb8dc403SDave Cobbley override_branches = [] 1742eb8dc403SDave Cobbley mainbranch = None 1743eb8dc403SDave Cobbley startbranch = None 1744eb8dc403SDave Cobbley if not no_overrides: 1745eb8dc403SDave Cobbley stdout, _ = bb.process.run('git branch', cwd=srctree) 1746eb8dc403SDave Cobbley other_branches = [] 1747eb8dc403SDave Cobbley for line in stdout.splitlines(): 1748eb8dc403SDave Cobbley branchname = line[2:] 1749eb8dc403SDave Cobbley if line.startswith('* '): 1750eb8dc403SDave Cobbley startbranch = branchname 1751eb8dc403SDave Cobbley if branchname.startswith(override_branch_prefix): 1752eb8dc403SDave Cobbley override_branches.append(branchname) 1753eb8dc403SDave Cobbley else: 1754eb8dc403SDave Cobbley other_branches.append(branchname) 1755eb8dc403SDave Cobbley 1756eb8dc403SDave Cobbley if override_branches: 1757eb8dc403SDave Cobbley logger.debug('_update_recipe: override branches: %s' % override_branches) 1758eb8dc403SDave Cobbley logger.debug('_update_recipe: other branches: %s' % other_branches) 1759eb8dc403SDave Cobbley if startbranch.startswith(override_branch_prefix): 1760eb8dc403SDave Cobbley if len(other_branches) == 1: 1761eb8dc403SDave Cobbley mainbranch = other_branches[1] 1762eb8dc403SDave Cobbley else: 1763eb8dc403SDave Cobbley raise DevtoolError('Unable to determine main branch - please check out the main branch in source tree first') 1764eb8dc403SDave Cobbley else: 1765eb8dc403SDave Cobbley mainbranch = startbranch 1766eb8dc403SDave Cobbley 1767eb8dc403SDave Cobbley checkedout = None 1768eb8dc403SDave Cobbley anyupdated = False 1769eb8dc403SDave Cobbley appendfile = None 1770eb8dc403SDave Cobbley allremoved = [] 1771eb8dc403SDave Cobbley if override_branches: 1772eb8dc403SDave Cobbley logger.info('Handling main branch (%s)...' % mainbranch) 1773eb8dc403SDave Cobbley if startbranch != mainbranch: 1774eb8dc403SDave Cobbley bb.process.run('git checkout %s' % mainbranch, cwd=srctree) 1775eb8dc403SDave Cobbley checkedout = mainbranch 1776eb8dc403SDave Cobbley try: 1777eb8dc403SDave Cobbley branchlist = [mainbranch] + override_branches 1778eb8dc403SDave Cobbley for branch in branchlist: 1779eb8dc403SDave Cobbley crd = bb.data.createCopy(rd) 1780eb8dc403SDave Cobbley if branch != mainbranch: 1781eb8dc403SDave Cobbley logger.info('Handling branch %s...' % branch) 1782eb8dc403SDave Cobbley override = branch[len(override_branch_prefix):] 1783eb8dc403SDave Cobbley crd.appendVar('OVERRIDES', ':%s' % override) 1784eb8dc403SDave Cobbley bb.process.run('git checkout %s' % branch, cwd=srctree) 1785eb8dc403SDave Cobbley checkedout = branch 1786eb8dc403SDave Cobbley 1787eb8dc403SDave Cobbley if mode == 'srcrev': 1788eb8dc403SDave Cobbley updated, appendf, removed = _update_recipe_srcrev(recipename, workspace, srctree, crd, appendlayerdir, wildcard_version, no_remove, no_report_remove, dry_run_outdir) 1789eb8dc403SDave Cobbley elif mode == 'patch': 1790eb8dc403SDave Cobbley updated, appendf, removed = _update_recipe_patch(recipename, workspace, srctree, crd, appendlayerdir, wildcard_version, no_remove, no_report_remove, initial_rev, dry_run_outdir, force_patch_refresh) 1791eb8dc403SDave Cobbley else: 1792eb8dc403SDave Cobbley raise DevtoolError('update_recipe: invalid mode %s' % mode) 1793eb8dc403SDave Cobbley if updated: 1794eb8dc403SDave Cobbley anyupdated = True 1795eb8dc403SDave Cobbley if appendf: 1796eb8dc403SDave Cobbley appendfile = appendf 1797eb8dc403SDave Cobbley allremoved.extend(removed) 1798eb8dc403SDave Cobbley finally: 1799eb8dc403SDave Cobbley if startbranch and checkedout != startbranch: 1800eb8dc403SDave Cobbley bb.process.run('git checkout %s' % startbranch, cwd=srctree) 1801eb8dc403SDave Cobbley 1802eb8dc403SDave Cobbley return anyupdated, appendfile, allremoved 1803eb8dc403SDave Cobbley 1804eb8dc403SDave Cobbleydef update_recipe(args, config, basepath, workspace): 1805eb8dc403SDave Cobbley """Entry point for the devtool 'update-recipe' subcommand""" 1806eb8dc403SDave Cobbley check_workspace_recipe(workspace, args.recipename) 1807eb8dc403SDave Cobbley 1808eb8dc403SDave Cobbley if args.append: 1809eb8dc403SDave Cobbley if not os.path.exists(args.append): 1810eb8dc403SDave Cobbley raise DevtoolError('bbappend destination layer directory "%s" ' 1811eb8dc403SDave Cobbley 'does not exist' % args.append) 1812eb8dc403SDave Cobbley if not os.path.exists(os.path.join(args.append, 'conf', 'layer.conf')): 1813eb8dc403SDave Cobbley raise DevtoolError('conf/layer.conf not found in bbappend ' 1814eb8dc403SDave Cobbley 'destination layer "%s"' % args.append) 1815eb8dc403SDave Cobbley 1816eb8dc403SDave Cobbley tinfoil = setup_tinfoil(basepath=basepath, tracking=True) 1817eb8dc403SDave Cobbley try: 1818eb8dc403SDave Cobbley 1819eb8dc403SDave Cobbley rd = parse_recipe(config, tinfoil, args.recipename, True) 1820eb8dc403SDave Cobbley if not rd: 1821eb8dc403SDave Cobbley return 1 1822eb8dc403SDave Cobbley 1823eb8dc403SDave Cobbley dry_run_output = None 1824eb8dc403SDave Cobbley dry_run_outdir = None 1825eb8dc403SDave Cobbley if args.dry_run: 1826eb8dc403SDave Cobbley dry_run_output = tempfile.TemporaryDirectory(prefix='devtool') 1827eb8dc403SDave Cobbley dry_run_outdir = dry_run_output.name 1828eb8dc403SDave Cobbley updated, _, _ = _update_recipe(args.recipename, workspace, rd, args.mode, args.append, args.wildcard_version, args.no_remove, args.initial_rev, dry_run_outdir=dry_run_outdir, no_overrides=args.no_overrides, force_patch_refresh=args.force_patch_refresh) 1829eb8dc403SDave Cobbley 1830eb8dc403SDave Cobbley if updated: 1831eb8dc403SDave Cobbley rf = rd.getVar('FILE') 1832eb8dc403SDave Cobbley if rf.startswith(config.workspace_path): 18331a4b7ee2SBrad Bishop logger.warning('Recipe file %s has been updated but is inside the workspace - you will need to move it (and any associated files next to it) out to the desired layer before using "devtool reset" in order to keep any changes' % rf) 1834eb8dc403SDave Cobbley finally: 1835eb8dc403SDave Cobbley tinfoil.shutdown() 1836eb8dc403SDave Cobbley 1837eb8dc403SDave Cobbley return 0 1838eb8dc403SDave Cobbley 1839eb8dc403SDave Cobbley 1840eb8dc403SDave Cobbleydef status(args, config, basepath, workspace): 1841eb8dc403SDave Cobbley """Entry point for the devtool 'status' subcommand""" 1842eb8dc403SDave Cobbley if workspace: 1843eb8dc403SDave Cobbley for recipe, value in sorted(workspace.items()): 1844eb8dc403SDave Cobbley recipefile = value['recipefile'] 1845eb8dc403SDave Cobbley if recipefile: 1846eb8dc403SDave Cobbley recipestr = ' (%s)' % recipefile 1847eb8dc403SDave Cobbley else: 1848eb8dc403SDave Cobbley recipestr = '' 1849eb8dc403SDave Cobbley print("%s: %s%s" % (recipe, value['srctree'], recipestr)) 1850eb8dc403SDave Cobbley else: 1851eb8dc403SDave Cobbley logger.info('No recipes currently in your workspace - you can use "devtool modify" to work on an existing recipe or "devtool add" to add a new one') 1852eb8dc403SDave Cobbley return 0 1853eb8dc403SDave Cobbley 1854eb8dc403SDave Cobbley 185564c979e8SBrad Bishopdef _reset(recipes, no_clean, remove_work, config, basepath, workspace): 1856eb8dc403SDave Cobbley """Reset one or more recipes""" 1857eb8dc403SDave Cobbley import oe.path 1858eb8dc403SDave Cobbley 1859eb8dc403SDave Cobbley def clean_preferred_provider(pn, layerconf_path): 1860eb8dc403SDave Cobbley """Remove PREFERRED_PROVIDER from layer.conf'""" 1861eb8dc403SDave Cobbley import re 1862eb8dc403SDave Cobbley layerconf_file = os.path.join(layerconf_path, 'conf', 'layer.conf') 1863eb8dc403SDave Cobbley new_layerconf_file = os.path.join(layerconf_path, 'conf', '.layer.conf') 1864eb8dc403SDave Cobbley pprovider_found = False 1865eb8dc403SDave Cobbley with open(layerconf_file, 'r') as f: 1866eb8dc403SDave Cobbley lines = f.readlines() 1867eb8dc403SDave Cobbley with open(new_layerconf_file, 'a') as nf: 1868eb8dc403SDave Cobbley for line in lines: 1869eb8dc403SDave Cobbley pprovider_exp = r'^PREFERRED_PROVIDER_.*? = "' + pn + r'"$' 1870eb8dc403SDave Cobbley if not re.match(pprovider_exp, line): 1871eb8dc403SDave Cobbley nf.write(line) 1872eb8dc403SDave Cobbley else: 1873eb8dc403SDave Cobbley pprovider_found = True 1874eb8dc403SDave Cobbley if pprovider_found: 1875eb8dc403SDave Cobbley shutil.move(new_layerconf_file, layerconf_file) 1876eb8dc403SDave Cobbley else: 1877eb8dc403SDave Cobbley os.remove(new_layerconf_file) 1878eb8dc403SDave Cobbley 1879eb8dc403SDave Cobbley if recipes and not no_clean: 1880eb8dc403SDave Cobbley if len(recipes) == 1: 1881eb8dc403SDave Cobbley logger.info('Cleaning sysroot for recipe %s...' % recipes[0]) 1882eb8dc403SDave Cobbley else: 1883eb8dc403SDave Cobbley logger.info('Cleaning sysroot for recipes %s...' % ', '.join(recipes)) 1884eb8dc403SDave Cobbley # If the recipe file itself was created in the workspace, and 1885eb8dc403SDave Cobbley # it uses BBCLASSEXTEND, then we need to also clean the other 1886eb8dc403SDave Cobbley # variants 1887eb8dc403SDave Cobbley targets = [] 1888eb8dc403SDave Cobbley for recipe in recipes: 1889eb8dc403SDave Cobbley targets.append(recipe) 1890eb8dc403SDave Cobbley recipefile = workspace[recipe]['recipefile'] 1891eb8dc403SDave Cobbley if recipefile and os.path.exists(recipefile): 1892eb8dc403SDave Cobbley targets.extend(get_bbclassextend_targets(recipefile, recipe)) 1893eb8dc403SDave Cobbley try: 1894eb8dc403SDave Cobbley exec_build_env_command(config.init_path, basepath, 'bitbake -c clean %s' % ' '.join(targets)) 1895eb8dc403SDave Cobbley except bb.process.ExecutionError as e: 1896eb8dc403SDave Cobbley raise DevtoolError('Command \'%s\' failed, output:\n%s\nIf you ' 1897eb8dc403SDave Cobbley 'wish, you may specify -n/--no-clean to ' 1898eb8dc403SDave Cobbley 'skip running this command when resetting' % 1899eb8dc403SDave Cobbley (e.command, e.stdout)) 1900eb8dc403SDave Cobbley 1901eb8dc403SDave Cobbley for pn in recipes: 1902eb8dc403SDave Cobbley _check_preserve(config, pn) 1903eb8dc403SDave Cobbley 1904eb8dc403SDave Cobbley appendfile = workspace[pn]['bbappend'] 1905eb8dc403SDave Cobbley if os.path.exists(appendfile): 1906eb8dc403SDave Cobbley # This shouldn't happen, but is possible if devtool errored out prior to 1907eb8dc403SDave Cobbley # writing the md5 file. We need to delete this here or the recipe won't 1908eb8dc403SDave Cobbley # actually be reset 1909eb8dc403SDave Cobbley os.remove(appendfile) 1910eb8dc403SDave Cobbley 1911eb8dc403SDave Cobbley preservepath = os.path.join(config.workspace_path, 'attic', pn, pn) 1912eb8dc403SDave Cobbley def preservedir(origdir): 1913eb8dc403SDave Cobbley if os.path.exists(origdir): 1914eb8dc403SDave Cobbley for root, dirs, files in os.walk(origdir): 1915eb8dc403SDave Cobbley for fn in files: 19161a4b7ee2SBrad Bishop logger.warning('Preserving %s in %s' % (fn, preservepath)) 1917eb8dc403SDave Cobbley _move_file(os.path.join(origdir, fn), 1918eb8dc403SDave Cobbley os.path.join(preservepath, fn)) 1919eb8dc403SDave Cobbley for dn in dirs: 1920eb8dc403SDave Cobbley preservedir(os.path.join(root, dn)) 1921eb8dc403SDave Cobbley os.rmdir(origdir) 1922eb8dc403SDave Cobbley 1923eb8dc403SDave Cobbley recipefile = workspace[pn]['recipefile'] 1924eb8dc403SDave Cobbley if recipefile and oe.path.is_path_parent(config.workspace_path, recipefile): 1925eb8dc403SDave Cobbley # This should always be true if recipefile is set, but just in case 1926eb8dc403SDave Cobbley preservedir(os.path.dirname(recipefile)) 1927eb8dc403SDave Cobbley # We don't automatically create this dir next to appends, but the user can 1928eb8dc403SDave Cobbley preservedir(os.path.join(config.workspace_path, 'appends', pn)) 1929eb8dc403SDave Cobbley 1930eb8dc403SDave Cobbley srctreebase = workspace[pn]['srctreebase'] 1931eb8dc403SDave Cobbley if os.path.isdir(srctreebase): 1932eb8dc403SDave Cobbley if os.listdir(srctreebase): 193364c979e8SBrad Bishop if remove_work: 193464c979e8SBrad Bishop logger.info('-r argument used on %s, removing source tree.' 193564c979e8SBrad Bishop ' You will lose any unsaved work' %pn) 193664c979e8SBrad Bishop shutil.rmtree(srctreebase) 193764c979e8SBrad Bishop else: 1938eb8dc403SDave Cobbley # We don't want to risk wiping out any work in progress 1939eb8dc403SDave Cobbley logger.info('Leaving source tree %s as-is; if you no ' 1940eb8dc403SDave Cobbley 'longer need it then please delete it manually' 1941eb8dc403SDave Cobbley % srctreebase) 1942eb8dc403SDave Cobbley else: 1943eb8dc403SDave Cobbley # This is unlikely, but if it's empty we can just remove it 1944eb8dc403SDave Cobbley os.rmdir(srctreebase) 1945eb8dc403SDave Cobbley 1946eb8dc403SDave Cobbley clean_preferred_provider(pn, config.workspace_path) 1947eb8dc403SDave Cobbley 1948eb8dc403SDave Cobbleydef reset(args, config, basepath, workspace): 1949eb8dc403SDave Cobbley """Entry point for the devtool 'reset' subcommand""" 1950eb8dc403SDave Cobbley import bb 195164c979e8SBrad Bishop import shutil 195264c979e8SBrad Bishop 195364c979e8SBrad Bishop recipes = "" 195464c979e8SBrad Bishop 1955eb8dc403SDave Cobbley if args.recipename: 1956eb8dc403SDave Cobbley if args.all: 1957eb8dc403SDave Cobbley raise DevtoolError("Recipe cannot be specified if -a/--all is used") 1958eb8dc403SDave Cobbley else: 1959eb8dc403SDave Cobbley for recipe in args.recipename: 1960eb8dc403SDave Cobbley check_workspace_recipe(workspace, recipe, checksrc=False) 1961eb8dc403SDave Cobbley elif not args.all: 1962eb8dc403SDave Cobbley raise DevtoolError("Recipe must be specified, or specify -a/--all to " 1963eb8dc403SDave Cobbley "reset all recipes") 1964eb8dc403SDave Cobbley if args.all: 1965eb8dc403SDave Cobbley recipes = list(workspace.keys()) 1966eb8dc403SDave Cobbley else: 1967eb8dc403SDave Cobbley recipes = args.recipename 1968eb8dc403SDave Cobbley 196964c979e8SBrad Bishop _reset(recipes, args.no_clean, args.remove_work, config, basepath, workspace) 1970eb8dc403SDave Cobbley 1971eb8dc403SDave Cobbley return 0 1972eb8dc403SDave Cobbley 1973eb8dc403SDave Cobbley 1974eb8dc403SDave Cobbleydef _get_layer(layername, d): 1975eb8dc403SDave Cobbley """Determine the base layer path for the specified layer name/path""" 1976eb8dc403SDave Cobbley layerdirs = d.getVar('BBLAYERS').split() 197796ff1984SBrad Bishop layers = {} # {basename: layer_paths} 197896ff1984SBrad Bishop for p in layerdirs: 197996ff1984SBrad Bishop bn = os.path.basename(p) 198096ff1984SBrad Bishop if bn not in layers: 198196ff1984SBrad Bishop layers[bn] = [p] 198296ff1984SBrad Bishop else: 198396ff1984SBrad Bishop layers[bn].append(p) 1984eb8dc403SDave Cobbley # Provide some shortcuts 1985eb8dc403SDave Cobbley if layername.lower() in ['oe-core', 'openembedded-core']: 198696ff1984SBrad Bishop layername = 'meta' 198796ff1984SBrad Bishop layer_paths = layers.get(layername, None) 198896ff1984SBrad Bishop if not layer_paths: 198996ff1984SBrad Bishop return os.path.abspath(layername) 199096ff1984SBrad Bishop elif len(layer_paths) == 1: 199196ff1984SBrad Bishop return os.path.abspath(layer_paths[0]) 1992eb8dc403SDave Cobbley else: 199396ff1984SBrad Bishop # multiple layers having the same base name 199496ff1984SBrad Bishop logger.warning("Multiple layers have the same base name '%s', use the first one '%s'." % (layername, layer_paths[0])) 199596ff1984SBrad Bishop logger.warning("Consider using path instead of base name to specify layer:\n\t\t%s" % '\n\t\t'.join(layer_paths)) 199696ff1984SBrad Bishop return os.path.abspath(layer_paths[0]) 199796ff1984SBrad Bishop 1998eb8dc403SDave Cobbley 1999eb8dc403SDave Cobbleydef finish(args, config, basepath, workspace): 2000eb8dc403SDave Cobbley """Entry point for the devtool 'finish' subcommand""" 2001eb8dc403SDave Cobbley import bb 2002eb8dc403SDave Cobbley import oe.recipeutils 2003eb8dc403SDave Cobbley 2004eb8dc403SDave Cobbley check_workspace_recipe(workspace, args.recipename) 2005eb8dc403SDave Cobbley 2006eb8dc403SDave Cobbley dry_run_suffix = ' (dry-run)' if args.dry_run else '' 2007eb8dc403SDave Cobbley 2008eb8dc403SDave Cobbley # Grab the equivalent of COREBASE without having to initialise tinfoil 2009eb8dc403SDave Cobbley corebasedir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..')) 2010eb8dc403SDave Cobbley 2011eb8dc403SDave Cobbley srctree = workspace[args.recipename]['srctree'] 2012eb8dc403SDave Cobbley check_git_repo_op(srctree, [corebasedir]) 2013eb8dc403SDave Cobbley dirty = check_git_repo_dirty(srctree) 2014eb8dc403SDave Cobbley if dirty: 2015eb8dc403SDave Cobbley if args.force: 2016eb8dc403SDave Cobbley logger.warning('Source tree is not clean, continuing as requested by -f/--force') 2017eb8dc403SDave Cobbley else: 2018eb8dc403SDave Cobbley raise DevtoolError('Source tree is not clean:\n\n%s\nEnsure you have committed your changes or use -f/--force if you are sure there\'s nothing that needs to be committed' % dirty) 2019eb8dc403SDave Cobbley 202000e122a7SBrad Bishop no_clean = args.no_clean 202164c979e8SBrad Bishop remove_work=args.remove_work 2022eb8dc403SDave Cobbley tinfoil = setup_tinfoil(basepath=basepath, tracking=True) 2023eb8dc403SDave Cobbley try: 2024*6dbb316aSBrad Bishop rd = parse_recipe(config, tinfoil, args.recipename, True) 2025eb8dc403SDave Cobbley if not rd: 2026eb8dc403SDave Cobbley return 1 2027eb8dc403SDave Cobbley 2028eb8dc403SDave Cobbley destlayerdir = _get_layer(args.destination, tinfoil.config_data) 2029eb8dc403SDave Cobbley recipefile = rd.getVar('FILE') 2030eb8dc403SDave Cobbley recipedir = os.path.dirname(recipefile) 2031eb8dc403SDave Cobbley origlayerdir = oe.recipeutils.find_layerdir(recipefile) 2032eb8dc403SDave Cobbley 2033eb8dc403SDave Cobbley if not os.path.isdir(destlayerdir): 2034eb8dc403SDave Cobbley raise DevtoolError('Unable to find layer or directory matching "%s"' % args.destination) 2035eb8dc403SDave Cobbley 2036eb8dc403SDave Cobbley if os.path.abspath(destlayerdir) == config.workspace_path: 2037eb8dc403SDave Cobbley raise DevtoolError('"%s" specifies the workspace layer - that is not a valid destination' % args.destination) 2038eb8dc403SDave Cobbley 2039eb8dc403SDave Cobbley # If it's an upgrade, grab the original path 2040eb8dc403SDave Cobbley origpath = None 2041eb8dc403SDave Cobbley origfilelist = None 2042eb8dc403SDave Cobbley append = workspace[args.recipename]['bbappend'] 2043eb8dc403SDave Cobbley with open(append, 'r') as f: 2044eb8dc403SDave Cobbley for line in f: 2045eb8dc403SDave Cobbley if line.startswith('# original_path:'): 2046eb8dc403SDave Cobbley origpath = line.split(':')[1].strip() 2047eb8dc403SDave Cobbley elif line.startswith('# original_files:'): 2048eb8dc403SDave Cobbley origfilelist = line.split(':')[1].split() 2049eb8dc403SDave Cobbley 2050eb8dc403SDave Cobbley destlayerbasedir = oe.recipeutils.find_layerdir(destlayerdir) 2051eb8dc403SDave Cobbley 2052eb8dc403SDave Cobbley if origlayerdir == config.workspace_path: 2053eb8dc403SDave Cobbley # Recipe file itself is in workspace, update it there first 2054eb8dc403SDave Cobbley appendlayerdir = None 2055eb8dc403SDave Cobbley origrelpath = None 2056eb8dc403SDave Cobbley if origpath: 2057eb8dc403SDave Cobbley origlayerpath = oe.recipeutils.find_layerdir(origpath) 2058eb8dc403SDave Cobbley if origlayerpath: 2059eb8dc403SDave Cobbley origrelpath = os.path.relpath(origpath, origlayerpath) 2060eb8dc403SDave Cobbley destpath = oe.recipeutils.get_bbfile_path(rd, destlayerdir, origrelpath) 2061eb8dc403SDave Cobbley if not destpath: 2062eb8dc403SDave Cobbley raise DevtoolError("Unable to determine destination layer path - check that %s specifies an actual layer and %s/conf/layer.conf specifies BBFILES. You may also need to specify a more complete path." % (args.destination, destlayerdir)) 2063eb8dc403SDave Cobbley # Warn if the layer isn't in bblayers.conf (the code to create a bbappend will do this in other cases) 2064eb8dc403SDave Cobbley layerdirs = [os.path.abspath(layerdir) for layerdir in rd.getVar('BBLAYERS').split()] 2065eb8dc403SDave Cobbley if not os.path.abspath(destlayerbasedir) in layerdirs: 2066eb8dc403SDave Cobbley bb.warn('Specified destination layer is not currently enabled in bblayers.conf, so the %s recipe will now be unavailable in your current configuration until you add the layer there' % args.recipename) 2067eb8dc403SDave Cobbley 2068eb8dc403SDave Cobbley elif destlayerdir == origlayerdir: 2069eb8dc403SDave Cobbley # Same layer, update the original recipe 2070eb8dc403SDave Cobbley appendlayerdir = None 2071eb8dc403SDave Cobbley destpath = None 2072eb8dc403SDave Cobbley else: 2073eb8dc403SDave Cobbley # Create/update a bbappend in the specified layer 2074eb8dc403SDave Cobbley appendlayerdir = destlayerdir 2075eb8dc403SDave Cobbley destpath = None 2076eb8dc403SDave Cobbley 2077eb8dc403SDave Cobbley # Actually update the recipe / bbappend 2078eb8dc403SDave Cobbley removing_original = (origpath and origfilelist and oe.recipeutils.find_layerdir(origpath) == destlayerbasedir) 2079eb8dc403SDave Cobbley dry_run_output = None 2080eb8dc403SDave Cobbley dry_run_outdir = None 2081eb8dc403SDave Cobbley if args.dry_run: 2082eb8dc403SDave Cobbley dry_run_output = tempfile.TemporaryDirectory(prefix='devtool') 2083eb8dc403SDave Cobbley dry_run_outdir = dry_run_output.name 2084eb8dc403SDave Cobbley updated, appendfile, removed = _update_recipe(args.recipename, workspace, rd, args.mode, appendlayerdir, wildcard_version=True, no_remove=False, no_report_remove=removing_original, initial_rev=args.initial_rev, dry_run_outdir=dry_run_outdir, no_overrides=args.no_overrides, force_patch_refresh=args.force_patch_refresh) 2085eb8dc403SDave Cobbley removed = [os.path.relpath(pth, recipedir) for pth in removed] 2086eb8dc403SDave Cobbley 2087eb8dc403SDave Cobbley # Remove any old files in the case of an upgrade 2088eb8dc403SDave Cobbley if removing_original: 2089eb8dc403SDave Cobbley for fn in origfilelist: 2090eb8dc403SDave Cobbley fnp = os.path.join(origpath, fn) 2091eb8dc403SDave Cobbley if fn in removed or not os.path.exists(os.path.join(recipedir, fn)): 2092eb8dc403SDave Cobbley logger.info('Removing file %s%s' % (fnp, dry_run_suffix)) 2093eb8dc403SDave Cobbley if not args.dry_run: 2094eb8dc403SDave Cobbley try: 2095eb8dc403SDave Cobbley os.remove(fnp) 2096eb8dc403SDave Cobbley except FileNotFoundError: 2097eb8dc403SDave Cobbley pass 2098eb8dc403SDave Cobbley 2099eb8dc403SDave Cobbley if origlayerdir == config.workspace_path and destpath: 2100eb8dc403SDave Cobbley # Recipe file itself is in the workspace - need to move it and any 2101eb8dc403SDave Cobbley # associated files to the specified layer 2102eb8dc403SDave Cobbley no_clean = True 2103eb8dc403SDave Cobbley logger.info('Moving recipe file to %s%s' % (destpath, dry_run_suffix)) 2104eb8dc403SDave Cobbley for root, _, files in os.walk(recipedir): 2105eb8dc403SDave Cobbley for fn in files: 2106eb8dc403SDave Cobbley srcpath = os.path.join(root, fn) 2107eb8dc403SDave Cobbley relpth = os.path.relpath(os.path.dirname(srcpath), recipedir) 2108eb8dc403SDave Cobbley destdir = os.path.abspath(os.path.join(destpath, relpth)) 2109eb8dc403SDave Cobbley destfp = os.path.join(destdir, fn) 2110eb8dc403SDave Cobbley _move_file(srcpath, destfp, dry_run_outdir=dry_run_outdir, base_outdir=destpath) 2111eb8dc403SDave Cobbley 2112eb8dc403SDave Cobbley if dry_run_outdir: 2113eb8dc403SDave Cobbley import difflib 2114eb8dc403SDave Cobbley comparelist = [] 2115eb8dc403SDave Cobbley for root, _, files in os.walk(dry_run_outdir): 2116eb8dc403SDave Cobbley for fn in files: 2117eb8dc403SDave Cobbley outf = os.path.join(root, fn) 2118eb8dc403SDave Cobbley relf = os.path.relpath(outf, dry_run_outdir) 2119eb8dc403SDave Cobbley logger.debug('dry-run: output file %s' % relf) 2120eb8dc403SDave Cobbley if fn.endswith('.bb'): 2121eb8dc403SDave Cobbley if origfilelist and origpath and destpath: 2122eb8dc403SDave Cobbley # Need to match this up with the pre-upgrade recipe file 2123eb8dc403SDave Cobbley for origf in origfilelist: 2124eb8dc403SDave Cobbley if origf.endswith('.bb'): 2125eb8dc403SDave Cobbley comparelist.append((os.path.abspath(os.path.join(origpath, origf)), 2126eb8dc403SDave Cobbley outf, 2127eb8dc403SDave Cobbley os.path.abspath(os.path.join(destpath, relf)))) 2128eb8dc403SDave Cobbley break 2129eb8dc403SDave Cobbley else: 2130eb8dc403SDave Cobbley # Compare to the existing recipe 2131eb8dc403SDave Cobbley comparelist.append((recipefile, outf, recipefile)) 2132eb8dc403SDave Cobbley elif fn.endswith('.bbappend'): 2133eb8dc403SDave Cobbley if appendfile: 2134eb8dc403SDave Cobbley if os.path.exists(appendfile): 2135eb8dc403SDave Cobbley comparelist.append((appendfile, outf, appendfile)) 2136eb8dc403SDave Cobbley else: 2137eb8dc403SDave Cobbley comparelist.append((None, outf, appendfile)) 2138eb8dc403SDave Cobbley else: 2139eb8dc403SDave Cobbley if destpath: 2140eb8dc403SDave Cobbley recipedest = destpath 2141eb8dc403SDave Cobbley elif appendfile: 2142eb8dc403SDave Cobbley recipedest = os.path.dirname(appendfile) 2143eb8dc403SDave Cobbley else: 2144eb8dc403SDave Cobbley recipedest = os.path.dirname(recipefile) 2145eb8dc403SDave Cobbley destfp = os.path.join(recipedest, relf) 2146eb8dc403SDave Cobbley if os.path.exists(destfp): 2147eb8dc403SDave Cobbley comparelist.append((destfp, outf, destfp)) 2148eb8dc403SDave Cobbley output = '' 2149eb8dc403SDave Cobbley for oldfile, newfile, newfileshow in comparelist: 2150eb8dc403SDave Cobbley if oldfile: 2151eb8dc403SDave Cobbley with open(oldfile, 'r') as f: 2152eb8dc403SDave Cobbley oldlines = f.readlines() 2153eb8dc403SDave Cobbley else: 2154eb8dc403SDave Cobbley oldfile = '/dev/null' 2155eb8dc403SDave Cobbley oldlines = [] 2156eb8dc403SDave Cobbley with open(newfile, 'r') as f: 2157eb8dc403SDave Cobbley newlines = f.readlines() 2158eb8dc403SDave Cobbley if not newfileshow: 2159eb8dc403SDave Cobbley newfileshow = newfile 2160eb8dc403SDave Cobbley diff = difflib.unified_diff(oldlines, newlines, oldfile, newfileshow) 2161eb8dc403SDave Cobbley difflines = list(diff) 2162eb8dc403SDave Cobbley if difflines: 2163eb8dc403SDave Cobbley output += ''.join(difflines) 2164eb8dc403SDave Cobbley if output: 2165eb8dc403SDave Cobbley logger.info('Diff of changed files:\n%s' % output) 2166eb8dc403SDave Cobbley finally: 2167eb8dc403SDave Cobbley tinfoil.shutdown() 2168eb8dc403SDave Cobbley 2169eb8dc403SDave Cobbley # Everything else has succeeded, we can now reset 2170eb8dc403SDave Cobbley if args.dry_run: 2171eb8dc403SDave Cobbley logger.info('Resetting recipe (dry-run)') 2172eb8dc403SDave Cobbley else: 217364c979e8SBrad Bishop _reset([args.recipename], no_clean=no_clean, remove_work=remove_work, config=config, basepath=basepath, workspace=workspace) 2174eb8dc403SDave Cobbley 2175eb8dc403SDave Cobbley return 0 2176eb8dc403SDave Cobbley 2177eb8dc403SDave Cobbley 2178eb8dc403SDave Cobbleydef get_default_srctree(config, recipename=''): 2179eb8dc403SDave Cobbley """Get the default srctree path""" 2180eb8dc403SDave Cobbley srctreeparent = config.get('General', 'default_source_parent_dir', config.workspace_path) 2181eb8dc403SDave Cobbley if recipename: 2182eb8dc403SDave Cobbley return os.path.join(srctreeparent, 'sources', recipename) 2183eb8dc403SDave Cobbley else: 2184eb8dc403SDave Cobbley return os.path.join(srctreeparent, 'sources') 2185eb8dc403SDave Cobbley 2186eb8dc403SDave Cobbleydef register_commands(subparsers, context): 2187eb8dc403SDave Cobbley """Register devtool subcommands from this plugin""" 2188eb8dc403SDave Cobbley 2189eb8dc403SDave Cobbley defsrctree = get_default_srctree(context.config) 2190eb8dc403SDave Cobbley parser_add = subparsers.add_parser('add', help='Add a new recipe', 2191eb8dc403SDave Cobbley description='Adds a new recipe to the workspace to build a specified source tree. Can optionally fetch a remote URI and unpack it to create the source tree.', 2192eb8dc403SDave Cobbley group='starting', order=100) 2193eb8dc403SDave Cobbley parser_add.add_argument('recipename', nargs='?', help='Name for new recipe to add (just name - no version, path or extension). If not specified, will attempt to auto-detect it.') 2194eb8dc403SDave Cobbley parser_add.add_argument('srctree', nargs='?', help='Path to external source tree. If not specified, a subdirectory of %s will be used.' % defsrctree) 2195eb8dc403SDave Cobbley parser_add.add_argument('fetchuri', nargs='?', help='Fetch the specified URI and extract it to create the source tree') 2196eb8dc403SDave Cobbley group = parser_add.add_mutually_exclusive_group() 2197eb8dc403SDave Cobbley group.add_argument('--same-dir', '-s', help='Build in same directory as source', action="store_true") 2198eb8dc403SDave Cobbley group.add_argument('--no-same-dir', help='Force build in a separate build directory', action="store_true") 2199eb8dc403SDave Cobbley parser_add.add_argument('--fetch', '-f', help='Fetch the specified URI and extract it to create the source tree (deprecated - pass as positional argument instead)', metavar='URI') 2200eb8dc403SDave Cobbley parser_add.add_argument('--fetch-dev', help='For npm, also fetch devDependencies', action="store_true") 2201eb8dc403SDave Cobbley parser_add.add_argument('--version', '-V', help='Version to use within recipe (PV)') 2202eb8dc403SDave Cobbley parser_add.add_argument('--no-git', '-g', help='If fetching source, do not set up source tree as a git repository', action="store_true") 2203eb8dc403SDave Cobbley group = parser_add.add_mutually_exclusive_group() 2204eb8dc403SDave Cobbley group.add_argument('--srcrev', '-S', help='Source revision to fetch if fetching from an SCM such as git (default latest)') 2205eb8dc403SDave Cobbley group.add_argument('--autorev', '-a', help='When fetching from a git repository, set SRCREV in the recipe to a floating revision instead of fixed', action="store_true") 2206eb8dc403SDave Cobbley parser_add.add_argument('--srcbranch', '-B', help='Branch in source repository if fetching from an SCM such as git (default master)') 2207eb8dc403SDave Cobbley 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') 2208eb8dc403SDave Cobbley 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') 2209eb8dc403SDave Cobbley parser_add.add_argument('--src-subdir', help='Specify subdirectory within source tree to use', metavar='SUBDIR') 2210eb8dc403SDave Cobbley parser_add.add_argument('--mirrors', help='Enable PREMIRRORS and MIRRORS for source tree fetching (disable by default).', action="store_true") 2211eb8dc403SDave Cobbley parser_add.add_argument('--provides', '-p', help='Specify an alias for the item provided by the recipe. E.g. virtual/libgl') 2212eb8dc403SDave Cobbley parser_add.set_defaults(func=add, fixed_setup=context.fixed_setup) 2213eb8dc403SDave Cobbley 2214eb8dc403SDave Cobbley parser_modify = subparsers.add_parser('modify', help='Modify the source for an existing recipe', 2215eb8dc403SDave Cobbley description='Sets up the build environment to modify the source for an existing recipe. The default behaviour is to extract the source being fetched by the recipe into a git tree so you can work on it; alternatively if you already have your own pre-prepared source tree you can specify -n/--no-extract.', 2216eb8dc403SDave Cobbley group='starting', order=90) 2217eb8dc403SDave Cobbley parser_modify.add_argument('recipename', help='Name of existing recipe to edit (just name - no version, path or extension)') 2218eb8dc403SDave Cobbley parser_modify.add_argument('srctree', nargs='?', help='Path to external source tree. If not specified, a subdirectory of %s will be used.' % defsrctree) 2219eb8dc403SDave Cobbley parser_modify.add_argument('--wildcard', '-w', action="store_true", help='Use wildcard for unversioned bbappend') 2220eb8dc403SDave Cobbley group = parser_modify.add_mutually_exclusive_group() 2221eb8dc403SDave Cobbley group.add_argument('--extract', '-x', action="store_true", help='Extract source for recipe (default)') 2222eb8dc403SDave Cobbley group.add_argument('--no-extract', '-n', action="store_true", help='Do not extract source, expect it to exist') 2223eb8dc403SDave Cobbley group = parser_modify.add_mutually_exclusive_group() 2224eb8dc403SDave Cobbley group.add_argument('--same-dir', '-s', help='Build in same directory as source', action="store_true") 2225eb8dc403SDave Cobbley group.add_argument('--no-same-dir', help='Force build in a separate build directory', action="store_true") 2226eb8dc403SDave Cobbley parser_modify.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (when not using -n/--no-extract) (default "%(default)s")') 2227eb8dc403SDave Cobbley parser_modify.add_argument('--no-overrides', '-O', action="store_true", help='Do not create branches for other override configurations') 2228eb8dc403SDave Cobbley parser_modify.add_argument('--keep-temp', help='Keep temporary directory (for debugging)', action="store_true") 2229eb8dc403SDave Cobbley parser_modify.set_defaults(func=modify, fixed_setup=context.fixed_setup) 2230eb8dc403SDave Cobbley 2231eb8dc403SDave Cobbley parser_extract = subparsers.add_parser('extract', help='Extract the source for an existing recipe', 2232eb8dc403SDave Cobbley description='Extracts the source for an existing recipe', 2233eb8dc403SDave Cobbley group='advanced') 2234eb8dc403SDave Cobbley parser_extract.add_argument('recipename', help='Name of recipe to extract the source for') 2235eb8dc403SDave Cobbley parser_extract.add_argument('srctree', help='Path to where to extract the source tree') 2236eb8dc403SDave Cobbley parser_extract.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (default "%(default)s")') 2237eb8dc403SDave Cobbley parser_extract.add_argument('--no-overrides', '-O', action="store_true", help='Do not create branches for other override configurations') 2238eb8dc403SDave Cobbley parser_extract.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)') 2239eb8dc403SDave Cobbley parser_extract.set_defaults(func=extract, fixed_setup=context.fixed_setup) 2240eb8dc403SDave Cobbley 2241eb8dc403SDave Cobbley parser_sync = subparsers.add_parser('sync', help='Synchronize the source tree for an existing recipe', 2242eb8dc403SDave Cobbley description='Synchronize the previously extracted source tree for an existing recipe', 2243eb8dc403SDave Cobbley formatter_class=argparse.ArgumentDefaultsHelpFormatter, 2244eb8dc403SDave Cobbley group='advanced') 2245eb8dc403SDave Cobbley parser_sync.add_argument('recipename', help='Name of recipe to sync the source for') 2246eb8dc403SDave Cobbley parser_sync.add_argument('srctree', help='Path to the source tree') 2247eb8dc403SDave Cobbley parser_sync.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout') 2248eb8dc403SDave Cobbley parser_sync.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)') 2249eb8dc403SDave Cobbley parser_sync.set_defaults(func=sync, fixed_setup=context.fixed_setup) 2250eb8dc403SDave Cobbley 2251eb8dc403SDave Cobbley parser_rename = subparsers.add_parser('rename', help='Rename a recipe file in the workspace', 2252eb8dc403SDave Cobbley description='Renames the recipe file for a recipe in the workspace, changing the name or version part or both, ensuring that all references within the workspace are updated at the same time. Only works when the recipe file itself is in the workspace, e.g. after devtool add. Particularly useful when devtool add did not automatically determine the correct name.', 2253eb8dc403SDave Cobbley group='working', order=10) 2254eb8dc403SDave Cobbley parser_rename.add_argument('recipename', help='Current name of recipe to rename') 2255eb8dc403SDave Cobbley parser_rename.add_argument('newname', nargs='?', help='New name for recipe (optional, not needed if you only want to change the version)') 2256eb8dc403SDave Cobbley parser_rename.add_argument('--version', '-V', help='Change the version (NOTE: this does not change the version fetched by the recipe, just the version in the recipe file name)') 2257eb8dc403SDave Cobbley parser_rename.add_argument('--no-srctree', '-s', action='store_true', help='Do not rename the source tree directory (if the default source tree path has been used) - keeping the old name may be desirable if there are internal/other external references to this path') 2258eb8dc403SDave Cobbley parser_rename.set_defaults(func=rename) 2259eb8dc403SDave Cobbley 2260eb8dc403SDave Cobbley parser_update_recipe = subparsers.add_parser('update-recipe', help='Apply changes from external source tree to recipe', 2261eb8dc403SDave Cobbley description='Applies changes from external source tree to a recipe (updating/adding/removing patches as necessary, or by updating SRCREV). Note that these changes need to have been committed to the git repository in order to be recognised.', 2262eb8dc403SDave Cobbley group='working', order=-90) 2263eb8dc403SDave Cobbley parser_update_recipe.add_argument('recipename', help='Name of recipe to update') 2264eb8dc403SDave Cobbley parser_update_recipe.add_argument('--mode', '-m', choices=['patch', 'srcrev', 'auto'], default='auto', help='Update mode (where %(metavar)s is %(choices)s; default is %(default)s)', metavar='MODE') 2265eb8dc403SDave Cobbley parser_update_recipe.add_argument('--initial-rev', help='Override starting revision for patches') 2266eb8dc403SDave Cobbley parser_update_recipe.add_argument('--append', '-a', help='Write changes to a bbappend in the specified layer instead of the recipe', metavar='LAYERDIR') 2267eb8dc403SDave Cobbley parser_update_recipe.add_argument('--wildcard-version', '-w', help='In conjunction with -a/--append, use a wildcard to make the bbappend apply to any recipe version', action='store_true') 2268eb8dc403SDave Cobbley parser_update_recipe.add_argument('--no-remove', '-n', action="store_true", help='Don\'t remove patches, only add or update') 2269eb8dc403SDave Cobbley parser_update_recipe.add_argument('--no-overrides', '-O', action="store_true", help='Do not handle other override branches (if they exist)') 2270eb8dc403SDave Cobbley parser_update_recipe.add_argument('--dry-run', '-N', action="store_true", help='Dry-run (just report changes instead of writing them)') 2271eb8dc403SDave Cobbley parser_update_recipe.add_argument('--force-patch-refresh', action="store_true", help='Update patches in the layer even if they have not been modified (useful for refreshing patch context)') 2272eb8dc403SDave Cobbley parser_update_recipe.set_defaults(func=update_recipe) 2273eb8dc403SDave Cobbley 2274eb8dc403SDave Cobbley parser_status = subparsers.add_parser('status', help='Show workspace status', 2275eb8dc403SDave Cobbley description='Lists recipes currently in your workspace and the paths to their respective external source trees', 2276eb8dc403SDave Cobbley group='info', order=100) 2277eb8dc403SDave Cobbley parser_status.set_defaults(func=status) 2278eb8dc403SDave Cobbley 2279eb8dc403SDave Cobbley parser_reset = subparsers.add_parser('reset', help='Remove a recipe from your workspace', 2280eb8dc403SDave Cobbley description='Removes the specified recipe(s) from your workspace (resetting its state back to that defined by the metadata).', 2281eb8dc403SDave Cobbley group='working', order=-100) 2282eb8dc403SDave Cobbley parser_reset.add_argument('recipename', nargs='*', help='Recipe to reset') 2283eb8dc403SDave Cobbley parser_reset.add_argument('--all', '-a', action="store_true", help='Reset all recipes (clear workspace)') 2284eb8dc403SDave Cobbley parser_reset.add_argument('--no-clean', '-n', action="store_true", help='Don\'t clean the sysroot to remove recipe output') 228564c979e8SBrad Bishop parser_reset.add_argument('--remove-work', '-r', action="store_true", help='Clean the sources directory along with append') 2286eb8dc403SDave Cobbley parser_reset.set_defaults(func=reset) 2287eb8dc403SDave Cobbley 2288eb8dc403SDave Cobbley parser_finish = subparsers.add_parser('finish', help='Finish working on a recipe in your workspace', 2289eb8dc403SDave Cobbley description='Pushes any committed changes to the specified recipe to the specified layer and removes it from your workspace. Roughly equivalent to an update-recipe followed by reset, except the update-recipe step will do the "right thing" depending on the recipe and the destination layer specified. Note that your changes must have been committed to the git repository in order to be recognised.', 2290eb8dc403SDave Cobbley group='working', order=-100) 2291eb8dc403SDave Cobbley parser_finish.add_argument('recipename', help='Recipe to finish') 2292eb8dc403SDave Cobbley parser_finish.add_argument('destination', help='Layer/path to put recipe into. Can be the name of a layer configured in your bblayers.conf, the path to the base of a layer, or a partial path inside a layer. %(prog)s will attempt to complete the path based on the layer\'s structure.') 2293eb8dc403SDave Cobbley parser_finish.add_argument('--mode', '-m', choices=['patch', 'srcrev', 'auto'], default='auto', help='Update mode (where %(metavar)s is %(choices)s; default is %(default)s)', metavar='MODE') 2294eb8dc403SDave Cobbley parser_finish.add_argument('--initial-rev', help='Override starting revision for patches') 2295eb8dc403SDave Cobbley parser_finish.add_argument('--force', '-f', action="store_true", help='Force continuing even if there are uncommitted changes in the source tree repository') 229664c979e8SBrad Bishop parser_finish.add_argument('--remove-work', '-r', action="store_true", help='Clean the sources directory under workspace') 229700e122a7SBrad Bishop parser_finish.add_argument('--no-clean', '-n', action="store_true", help='Don\'t clean the sysroot to remove recipe output') 2298eb8dc403SDave Cobbley parser_finish.add_argument('--no-overrides', '-O', action="store_true", help='Do not handle other override branches (if they exist)') 2299eb8dc403SDave Cobbley parser_finish.add_argument('--dry-run', '-N', action="store_true", help='Dry-run (just report changes instead of writing them)') 2300eb8dc403SDave Cobbley parser_finish.add_argument('--force-patch-refresh', action="store_true", help='Update patches in the layer even if they have not been modified (useful for refreshing patch context)') 2301eb8dc403SDave Cobbley parser_finish.set_defaults(func=finish) 2302