summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Freihofer <adrian.freihofer@gmail.com>2025-01-26 13:48:03 +0100
committerSteve Sakoman <steve@sakoman.com>2025-02-03 06:24:37 -0800
commite1f3ee328b826753ee82bc040d586477100c58e6 (patch)
treebc91d37071fde02437152df671af9429fe13f084
parenta221cda57cabf202e815fde3fa45787b96d562b5 (diff)
downloadpoky-e1f3ee328b826753ee82bc040d586477100c58e6.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: ad633eb3b90adb1087609c97ab8dc83ca0f08ad2) Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-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 65873b088d..eee5425aa7 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):]