summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Freihofer <adrian.freihofer@siemens.com>2024-12-16 18:43:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-17 11:41:53 +0000
commit71acb3b781d8fd6749ebc1ff4895d0fe9ca78d2b (patch)
treef7f625b184825b3f18c7e2cb859dfa301ea4c0a6
parent1f7eb26c947dde14698ae6e2ab88f0637027f4cb (diff)
downloadpoky-71acb3b781d8fd6749ebc1ff4895d0fe9ca78d2b.tar.gz
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 <adrian.freihofer@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/lib/devtool/ide_sdk.py4
1 files changed, 2 insertions, 2 deletions
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:
493 493
494 vars = (key for key in d.keys() if not key.startswith( 494 vars = (key for key in d.keys() if not key.startswith(
495 "__") and not d.getVarFlag(key, "func", False)) 495 "__") and not d.getVarFlag(key, "func", False))
496 for var in vars: 496 for var in sorted(vars):
497 func = d.getVarFlag(var, "func", False) 497 func = d.getVarFlag(var, "func", False)
498 if d.getVarFlag(var, 'python', False) and func: 498 if d.getVarFlag(var, 'python', False) and func:
499 continue 499 continue
@@ -545,7 +545,7 @@ class RecipeModified:
545 cache_vars = {} 545 cache_vars = {}
546 oecmake_args = d.getVar('OECMAKE_ARGS').split() 546 oecmake_args = d.getVar('OECMAKE_ARGS').split()
547 extra_oecmake = d.getVar('EXTRA_OECMAKE').split() 547 extra_oecmake = d.getVar('EXTRA_OECMAKE').split()
548 for param in oecmake_args + extra_oecmake: 548 for param in sorted(oecmake_args + extra_oecmake):
549 d_pref = "-D" 549 d_pref = "-D"
550 if param.startswith(d_pref): 550 if param.startswith(d_pref):
551 param = param[len(d_pref):] 551 param = param[len(d_pref):]