@@ -18,7 +18,7 @@ do_update_crates[depends] = "python3-native:do_populate_sysroot"
do_update_crates[nostamp] = "1"
do_update_crates[doc] = "Update the recipe by reading Cargo.lock and write in ${THISDIR}/${BPN}-crates.inc"
-RECIPE_UPDATE_EXTRA_TASKS += "do_update_crates"
+RECIPE_UPGRADE_EXTRA_TASKS += "do_update_crates"
# The directory where to search for Cargo.lock files
CARGO_LOCK_SRC_DIR ??= "${S}"
@@ -2017,7 +2017,7 @@ class DevtoolUpgradeTests(DevtoolBase):
newlines = f.readlines()
self.assertEqual(desiredlines, newlines)
- def test_devtool_upgrade_recipe_update_extra_tasks(self):
+ def test_devtool_upgrade_recipe_upgrade_extra_tasks(self):
# Check preconditions
self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory')
self.track_for_cleanup(self.workspacedir)
@@ -534,14 +534,14 @@ def _generate_license_diff(old_licenses, new_licenses):
diff = diff + line
return diff
-def _run_recipe_update_extra_tasks(pn, rd, tinfoil):
+def _run_recipe_upgrade_extra_tasks(pn, rd, tinfoil):
tasks = []
- for task in (rd.getVar('RECIPE_UPDATE_EXTRA_TASKS') or '').split():
- logger.info('Running extra recipe update task: %s' % task)
+ for task in (rd.getVar('RECIPE_UPGRADE_EXTRA_TASKS') or '').split():
+ logger.info('Running extra recipe upgrade task: %s' % task)
res = tinfoil.build_targets(pn, task, handle_events=True)
if not res:
- raise DevtoolError('Running extra recipe update task %s for %s failed' % (task, pn))
+ raise DevtoolError('Running extra recipe upgrade task %s for %s failed' % (task, pn))
def upgrade(args, config, basepath, workspace):
"""Entry point for the devtool 'upgrade' subcommand"""
@@ -618,7 +618,7 @@ def upgrade(args, config, basepath, workspace):
copied, config.workspace_path, rd)
standard._add_md5(config, pn, af)
- _run_recipe_update_extra_tasks(pn, rd, tinfoil)
+ _run_recipe_upgrade_extra_tasks(pn, rd, tinfoil)
update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn])