summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes-recipe/cargo-update-recipe-crates.bbclass2
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py2
-rw-r--r--scripts/lib/devtool/upgrade.py10
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes-recipe/cargo-update-recipe-crates.bbclass b/meta/classes-recipe/cargo-update-recipe-crates.bbclass
index a19ce16b46..3251d5ef2e 100644
--- a/meta/classes-recipe/cargo-update-recipe-crates.bbclass
+++ b/meta/classes-recipe/cargo-update-recipe-crates.bbclass
@@ -18,7 +18,7 @@ do_update_crates[depends] = "python3-native:do_populate_sysroot"
18do_update_crates[nostamp] = "1" 18do_update_crates[nostamp] = "1"
19do_update_crates[doc] = "Update the recipe by reading Cargo.lock and write in ${THISDIR}/${BPN}-crates.inc" 19do_update_crates[doc] = "Update the recipe by reading Cargo.lock and write in ${THISDIR}/${BPN}-crates.inc"
20 20
21RECIPE_UPDATE_EXTRA_TASKS += "do_update_crates" 21RECIPE_UPGRADE_EXTRA_TASKS += "do_update_crates"
22 22
23# The directory where to search for Cargo.lock files 23# The directory where to search for Cargo.lock files
24CARGO_LOCK_SRC_DIR ??= "${S}" 24CARGO_LOCK_SRC_DIR ??= "${S}"
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 432d9c9a67..7d61773980 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -2017,7 +2017,7 @@ class DevtoolUpgradeTests(DevtoolBase):
2017 newlines = f.readlines() 2017 newlines = f.readlines()
2018 self.assertEqual(desiredlines, newlines) 2018 self.assertEqual(desiredlines, newlines)
2019 2019
2020 def test_devtool_upgrade_recipe_update_extra_tasks(self): 2020 def test_devtool_upgrade_recipe_upgrade_extra_tasks(self):
2021 # Check preconditions 2021 # Check preconditions
2022 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') 2022 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory')
2023 self.track_for_cleanup(self.workspacedir) 2023 self.track_for_cleanup(self.workspacedir)
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 9ec6648851..eed3a49e4b 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -534,14 +534,14 @@ def _generate_license_diff(old_licenses, new_licenses):
534 diff = diff + line 534 diff = diff + line
535 return diff 535 return diff
536 536
537def _run_recipe_update_extra_tasks(pn, rd, tinfoil): 537def _run_recipe_upgrade_extra_tasks(pn, rd, tinfoil):
538 tasks = [] 538 tasks = []
539 for task in (rd.getVar('RECIPE_UPDATE_EXTRA_TASKS') or '').split(): 539 for task in (rd.getVar('RECIPE_UPGRADE_EXTRA_TASKS') or '').split():
540 logger.info('Running extra recipe update task: %s' % task) 540 logger.info('Running extra recipe upgrade task: %s' % task)
541 res = tinfoil.build_targets(pn, task, handle_events=True) 541 res = tinfoil.build_targets(pn, task, handle_events=True)
542 542
543 if not res: 543 if not res:
544 raise DevtoolError('Running extra recipe update task %s for %s failed' % (task, pn)) 544 raise DevtoolError('Running extra recipe upgrade task %s for %s failed' % (task, pn))
545 545
546def upgrade(args, config, basepath, workspace): 546def upgrade(args, config, basepath, workspace):
547 """Entry point for the devtool 'upgrade' subcommand""" 547 """Entry point for the devtool 'upgrade' subcommand"""
@@ -618,7 +618,7 @@ def upgrade(args, config, basepath, workspace):
618 copied, config.workspace_path, rd) 618 copied, config.workspace_path, rd)
619 standard._add_md5(config, pn, af) 619 standard._add_md5(config, pn, af)
620 620
621 _run_recipe_update_extra_tasks(pn, rd, tinfoil) 621 _run_recipe_upgrade_extra_tasks(pn, rd, tinfoil)
622 622
623 update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn]) 623 update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn])
624 624