From: Alexander Kanavin <a...@linutronix.de>
'UPDATE' as a name is somewhat unfortunate as the variable is intended only for
the 'devtool upgrade' operation and devtool also has an 'update-recipe'
operation.
Signed-off-by: Alexander Kanavin <a...@linutronix.de>
---
meta/classes-recipe/cargo-update-recipe-crates.bbclass | 2 +-
meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
scripts/lib/devtool/upgrade.py | 10 +++++-----
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 a19ce16b467..3251d5ef2e5 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"
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}"
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 432d9c9a673..7d617739809 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -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)
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 9ec66488516..eed3a49e4b2 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):
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])
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#202922):
https://lists.openembedded.org/g/openembedded-core/message/202922
Mute This Topic: https://lists.openembedded.org/mt/107687648/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
