From: Alexander Kanavin <[email protected]>
This will allow 'lockstep upgrades' of such recipes, improving success
rates in automated version updating process.
devtool check-upgrade-status now prints:
These recipes need to be upgraded together {
glib-2.0 2.80.2 2.80.4 Anuj Mittal
<[email protected]>
glib-2.0-initial 2.80.2 2.80.4 Anuj Mittal
<[email protected]>
}
These recipes need to be upgraded together {
util-linux 2.39.3 2.40.2 Chen Qi
<[email protected]>
util-linux-libuuid 2.39.3 2.40.2 Chen Qi
<[email protected]>
}
These recipes need to be upgraded together {
cmake 3.29.3 3.30.0 Unassigned
<[email protected]>
cmake-native 3.29.3 3.30.0 Unassigned
<[email protected]>
}
etc.
Signed-off-by: Alexander Kanavin <[email protected]>
---
meta/lib/oe/recipeutils.py | 23 +++++++++++++++++-
meta/lib/oeqa/selftest/cases/distrodata.py | 6 ++---
scripts/lib/devtool/upgrade.py | 28 +++++++++++++++-------
3 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 7586332fe0c..56be75dc9c9 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -1154,6 +1154,7 @@ def get_recipe_upgrade_status(recipes=None):
if not recipes:
recipes = tinfoil.all_recipe_files(variants=False)
+ recipeincludes = {}
for fn in recipes:
try:
if fn.startswith("/"):
@@ -1178,11 +1179,13 @@ def get_recipe_upgrade_status(recipes=None):
data_copy_list.append(data_copy)
+ recipeincludes[data.getVar('FILE')] =
{'bbincluded':data.getVar('BBINCLUDED').split(),'pn':data.getVar('PN')}
+
from concurrent.futures import ProcessPoolExecutor
with ProcessPoolExecutor(max_workers=utils.cpu_count()) as executor:
pkgs_list = executor.map(_get_recipe_upgrade_status, data_copy_list)
- return pkgs_list
+ return _group_recipes(pkgs_list,
_get_common_include_recipes(recipeincludes))
def get_common_include_recipes():
with bb.tinfoil.Tinfoil() as tinfoil:
@@ -1220,3 +1223,21 @@ def _get_common_include_recipes(recipeincludes_all):
recipes_with_shared_includes.append(recipeset)
return recipes_with_shared_includes
+
+def _group_recipes(recipes, groups):
+ recipedict = {}
+ for r in recipes:
+ recipedict[r['pn']] = r
+
+ recipegroups = []
+ for g in groups:
+ recipeset = []
+ for r in g:
+ if r in recipedict.keys():
+ recipeset.append(recipedict[r])
+ del recipedict[r]
+ recipegroups.append(recipeset)
+
+ for r in recipedict.values():
+ recipegroups.append([r])
+ return recipegroups
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py
b/meta/lib/oeqa/selftest/cases/distrodata.py
index bc561605220..bd375523649 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -20,10 +20,10 @@ class Distrodata(OESelftestTestCase):
feature = 'LICENSE_FLAGS_ACCEPTED += " commercial"\n'
self.write_config(feature)
- pkgs = oe.recipeutils.get_recipe_upgrade_status()
+ pkggroups = oe.recipeutils.get_recipe_upgrade_status()
- regressed_failures = [pkg['pn'] for pkg in pkgs if pkg['status'] ==
'UNKNOWN_BROKEN']
- regressed_successes = [pkg['pn'] for pkg in pkgs if pkg['status'] ==
'KNOWN_BROKEN']
+ regressed_failures = [pkg['pn'] for pkgs in pkggroups for pkg in pkgs
if pkg['status'] == 'UNKNOWN_BROKEN']
+ regressed_successes = [pkg['pn'] for pkgs in pkggroups for pkg in pkgs
if pkg['status'] == 'KNOWN_BROKEN']
msg = ""
if len(regressed_failures) > 0:
msg = msg + """
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 10b4f8b5ee5..4c268af3a7c 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -654,18 +654,28 @@ def latest_version(args, config, basepath, workspace):
return 0
def check_upgrade_status(args, config, basepath, workspace):
+ def _print_status(recipe):
+ print("{:25} {:15} {:15} {} {} {}".format( recipe['pn'],
+
recipe['cur_ver'],
+
recipe['status'] if recipe['status'] != 'UPDATE' else (recipe['next_ver'] if
not recipe['next_ver'].endswith("new-commits-available") else "new commits"),
+
recipe['maintainer'],
+
recipe['revision'] if recipe['revision'] != 'N/A' else "",
+ "cannot be
updated due to: %s" %(recipe['no_upgrade_reason']) if
recipe['no_upgrade_reason'] else ""))
if not args.recipe:
logger.info("Checking the upstream status for all recipes may take a
few minutes")
results = oe.recipeutils.get_recipe_upgrade_status(args.recipe)
- for result in results:
- # pn, update_status, current, latest, maintainer, latest_commit,
no_update_reason
- if args.all or result['status'] != 'MATCH':
- print("{:25} {:15} {:15} {} {} {}".format( result['pn'],
-
result['cur_ver'],
-
result['status'] if result['status'] != 'UPDATE' else (result['next_ver'] if
not result['next_ver'].endswith("new-commits-available") else "new commits"),
-
result['maintainer'],
-
result['revision'] if result['revision'] != 'N/A' else "",
- "cannot be
updated due to: %s" %(result['no_upgrade_reason']) if
result['no_upgrade_reason'] else ""))
+ for recipegroup in results:
+ upgrades = [r for r in recipegroup if r['status'] != 'MATCH']
+ currents = [r for r in recipegroup if r['status'] == 'MATCH']
+ if len(upgrades) > 1:
+ print("These recipes need to be upgraded together {")
+ for r in upgrades:
+ _print_status(r)
+ if len(upgrades) > 1:
+ print("}")
+ for r in currents:
+ if args.all:
+ _print_status(r)
def register_commands(subparsers, context):
"""Register devtool subcommands from this plugin"""
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#202174):
https://lists.openembedded.org/g/openembedded-core/message/202174
Mute This Topic: https://lists.openembedded.org/mt/107403316/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
