summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-08-02 18:09:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-03 07:56:10 +0100
commit18e4194539f33e4d702144ae7ad92875f0bbe41b (patch)
treebb2479b084caa8e9ddcbb830f65f748f3a36e44f /scripts
parentaf2b1221e8f7d2287c7039c8d6e83c04d85cac2d (diff)
downloadpoky-18e4194539f33e4d702144ae7ad92875f0bbe41b.tar.gz
devtool/upgrade: rename RECIPE_UPDATE_EXTRA_TASKS -> RECIPE_UPGRADE_EXTRA_TASKS
'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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/upgrade.py10
1 files changed, 5 insertions, 5 deletions
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