diff options
| author | Christoph Niedermaier <[email protected]> | 2022-03-01 09:38:51 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-07 16:50:53 -0400 |
| commit | cc5a490cf46565d3a42f86beaac05f56f4f40741 (patch) | |
| tree | 5069dc35da0b9b1598576f46c1af34b4c4ad513f | |
| parent | 7d79cba28ca9bb02ba589eca2e80ce837d7d0ca8 (diff) | |
Makefile: Sort u-boot-initial-env output
This will sort the default environment file generated by
"make u-boot-initial-env", but won't sort the default
environment in the compiled u-boot binary. The file
u-boot-initial-env is considered to use for the userpace
environment access tools [1] in case of that the
environments is written the first time into its location.
This is done on the one hand for a better overview and
comparison of the generated environment file. On the other
hand it is to synchronize the output with the script
get_default_env.sh, which generated a sorted default
environment file. The sorting preserves the order of equal
variable names by sorting only the variable name, and
disable the last-resort comparison. After sorting,
unnoticed blank lines at the end move to the top. Avoid
that by removing it before sorting.
[1] https://github.com/sbabic/libubootenv
Signed-off-by: Christoph Niedermaier <[email protected]>
Reviewed-by: Stefano Babic <[email protected]>
Tested-by: Stefano Babic <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Marek Behún <[email protected]>
To: [email protected]
Reviewed-by: Simon Glass <[email protected]>
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2459,7 +2459,8 @@ endif quiet_cmd_genenv = GENENV $@ cmd_genenv = $(OBJCOPY) --dump-section .rodata.default_environment=$@ env/common.o; \ - sed --in-place -e 's/\x00/\x0A/g' $@ + sed --in-place -e 's/\x00/\x0A/g' $@; sed --in-place -e '/^\s*$$/d' $@; \ + sort --field-separator== -k1,1 --stable $@ -o $@ u-boot-initial-env: u-boot.bin $(call if_changed,genenv) |