From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 2/4] lib/recipeutils: add a function to determine recipes with shared include files
Date: Wed, 17 Jul 2024 20:22:14 +0200 [thread overview]
Message-ID: <20240717182216.1661015-2-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20240717182216.1661015-1-alex.kanavin@gmail.com>
From: Alexander Kanavin <alex@linutronix.de>
This functionality is needed for 'lockstep version upgrades' where several
recipes need to be upgraded at the same time to produce a buildable
outcome.
The function itself obtains BBINCLUDED for each recipe and then massages
the data until it takes the form of a list of sets:
[{'cmake','cmake-native'},
{'qemu','qemu-native','qemu-system-native'},
... ]
There's also a selftest that checks for the above.
Unfortunately this won't detect mutually exclusive recipes like mesa and mesa-gl
as they're chosen with PREFERRED_PROVIDER and can't be enabled in the same build
at the same time. ('devtool upgrade' will also accept just one of them but not the other)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/lib/oe/recipeutils.py | 37 ++++++++++++++++++++++
meta/lib/oeqa/selftest/cases/distrodata.py | 12 +++++++
2 files changed, 49 insertions(+)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index f9d7dfe253a..7586332fe0c 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -1183,3 +1183,40 @@ def get_recipe_upgrade_status(recipes=None):
pkgs_list = executor.map(_get_recipe_upgrade_status, data_copy_list)
return pkgs_list
+
+def get_common_include_recipes():
+ with bb.tinfoil.Tinfoil() as tinfoil:
+ tinfoil.prepare(config_only=False)
+
+ recipes = tinfoil.all_recipe_files(variants=False)
+
+ recipeincludes = {}
+ for fn in recipes:
+ data = tinfoil.parse_recipe_file(fn)
+ recipeincludes[fn] = {'bbincluded':data.getVar('BBINCLUDED').split(),'pn':data.getVar('PN')}
+ return _get_common_include_recipes(recipeincludes)
+
+def _get_common_include_recipes(recipeincludes_all):
+ recipeincludes = {}
+ for fn,data in recipeincludes_all.items():
+ bbincluded_filtered = [i for i in data['bbincluded'] if os.path.dirname(i) == os.path.dirname(fn) and i != fn]
+ if bbincluded_filtered:
+ recipeincludes[data['pn']] = bbincluded_filtered
+
+ recipeincludes_inverted = {}
+ for k,v in recipeincludes.items():
+ for i in v:
+ recipeincludes_inverted.setdefault(i,set()).add(k)
+
+ recipeincludes_inverted_filtered = {k:v for k,v in recipeincludes_inverted.items() if len(v) > 1}
+
+ recipes_with_shared_includes = list()
+ for v in recipeincludes_inverted_filtered.values():
+ recipeset = v
+ for v1 in recipeincludes_inverted_filtered.values():
+ if recipeset.intersection(v1):
+ recipeset.update(v1)
+ if recipeset not in recipes_with_shared_includes:
+ recipes_with_shared_includes.append(recipeset)
+
+ return recipes_with_shared_includes
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index b60913dbca4..bc561605220 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -115,3 +115,15 @@ The list of oe-core recipes with maintainers is empty. This may indicate that th
self.fail("""
Unable to find recipes for the following entries in maintainers.inc:
""" + "\n".join(['%s' % i for i in missing_recipes]))
+
+ def test_common_include_recipes(self):
+ """
+ Summary: Test that obtaining recipes that share includes between them returns a sane result
+ Expected: At least cmake and qemu entries are present in the output
+ Product: oe-core
+ Author: Alexander Kanavin <alex.kanavin@gmail.com>
+ """
+ recipes = oe.recipeutils.get_common_include_recipes()
+
+ self.assertIn({'qemu-system-native', 'qemu', 'qemu-native'}, recipes)
+ self.assertIn({'cmake-native', 'cmake'}, recipes)
--
2.39.2
next prev parent reply other threads:[~2024-07-17 18:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-17 18:22 [PATCH 1/4] lib/oe/recipeutils: return a dict in get_recipe_upgrade_status() instead of a tuple Alexander Kanavin
2024-07-17 18:22 ` Alexander Kanavin [this message]
2024-07-22 14:43 ` [OE-core] [PATCH 2/4] lib/recipeutils: add a function to determine recipes with shared include files Richard Purdie
2024-07-23 7:15 ` Alexander Kanavin
2024-07-23 7:21 ` Richard Purdie
2024-07-23 7:27 ` Alexander Kanavin
2024-07-17 18:22 ` [PATCH 3/4] recipeutils/get_recipe_upgrade_status: group recipes when they need to be upgraded together Alexander Kanavin
2024-07-17 18:38 ` Patchtest results for " patchtest
2024-07-17 18:22 ` [PATCH 4/4] devtool/upgrade: use PN instead of BPN for naming newly created upgraded recipes Alexander Kanavin
2024-07-17 18:38 ` Patchtest results for [PATCH 1/4] lib/oe/recipeutils: return a dict in get_recipe_upgrade_status() instead of a tuple patchtest
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240717182216.1661015-2-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=alex@linutronix.de \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox