From 71acb3b781d8fd6749ebc1ff4895d0fe9ca78d2b Mon Sep 17 00:00:00 2001 From: Adrian Freihofer Date: Mon, 16 Dec 2024 18:43:04 +0100 Subject: devtool: ide-sdk sort cmake preset Sort the keys of the generated CMakeUserPreset.json file to make it easier to search and compare. (From OE-Core rev: b886c26bf893878ba8eb6bee80dd0507e5cb0d2d) Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie --- scripts/lib/devtool/ide_sdk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/lib/devtool/ide_sdk.py') diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 2f6eddec2a..42ee13b3e5 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -493,7 +493,7 @@ class RecipeModified: vars = (key for key in d.keys() if not key.startswith( "__") and not d.getVarFlag(key, "func", False)) - for var in vars: + for var in sorted(vars): func = d.getVarFlag(var, "func", False) if d.getVarFlag(var, 'python', False) and func: continue @@ -545,7 +545,7 @@ class RecipeModified: cache_vars = {} oecmake_args = d.getVar('OECMAKE_ARGS').split() extra_oecmake = d.getVar('EXTRA_OECMAKE').split() - for param in oecmake_args + extra_oecmake: + for param in sorted(oecmake_args + extra_oecmake): d_pref = "-D" if param.startswith(d_pref): param = param[len(d_pref):] -- cgit v1.2.3-54-g00ecf