On 2022-05-06 03:09, Alexander Kanavin wrote:
I think the terminology is a bit confused here, instead of 'command' it should say 'recipe'. Also: """Check if the command is available in the recipes""" is not everything it does, it also builds the recipe. And please write a commit message that explains what and why.
Additionally, I would squash commits 1/5 and 2/5. Most people, including myself, will review the commits in order, in doing so commit 1/5 is reviewed as original work, only to find in 2/5 that it was an existing function, just made generic. Combining these also makes it easier when mining history.
MarkA
Alex On Fri, 6 May 2022 at 09:00, Stefan Herbrechtsmeier <stefan.herbrechtsmeier-...@weidmueller.com> wrote:From: Lukas Funke <lukas.fu...@weidmueller.com> Signed-off-by: Lukas Funke <lukas.fu...@weidmueller.com> Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsme...@weidmueller.com> --- scripts/lib/recipetool/create.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 824ac6350d..efcb82173e 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -1375,6 +1375,29 @@ def convert_rpm_xml(xmlfile): values[varname] = child[0].text return values +def ensure_native_cmd(tinfoil, cmd): + """Check if the command is available in the recipes""" + if not tinfoil.recipes_parsed: + tinfoil.parse_recipes() + + try: + d = tinfoil.parse_recipe("%s-native" % cmd) + except bb.providers.NoProvider: + bb.error("Nothing provides '%s-native' which is required for the build" % cmd) + bb.note("You will likely need to add a layer that provides %s" % cmd) + sys.exit(14) + + bindir = d.getVar("STAGING_BINDIR_NATIVE") + cmdpath = os.path.join(bindir, cmd) + + if not os.path.exists(cmdpath): + tinfoil.build_targets("%s-native" % cmd, "addto_recipe_sysroot") + + if not os.path.exists(cmdpath): + bb.error("Failed to add '%s' to sysroot" % cmd) + sys.exit(14) + + return bindir def register_commands(subparsers): parser_create = subparsers.add_parser('create', -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#165523): https://lists.openembedded.org/g/openembedded-core/message/165523 Mute This Topic: https://lists.openembedded.org/mt/90928682/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
