MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

devtool/upgrade: rename RECIPE_UPDATE_EXTRA_TASKS -> RECIPE_UPGRADE_EXTRA_TASKS

Browse Source 
'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.

(From OE-Core rev: 4467aa0661e233f44c4ce029428c67d88fccfc07)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2024-08-02 18:09:00 +02:00 committed by Richard Purdie
parent af2b1221e8
commit 18e4194539
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes-recipe/cargo-update-recipe-crates.bbclass
View File

@ -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}"

2
meta/lib/oeqa/selftest/cases/devtool.py
View File

@ -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)

10
scripts/lib/devtool/upgrade.py
View File

@ -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])