From: Christoph Niedermaier Date: Tue, 1 Mar 2022 08:38:51 +0000 (+0100) Subject: Makefile: Sort u-boot-initial-env output X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=cc5a490cf46565d3a42f86beaac05f56f4f40741;p=u-boot.git 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 Reviewed-by: Stefano Babic Tested-by: Stefano Babic Cc: Stefano Babic Cc: Simon Glass Cc: Marek Behún To: u-boot@lists.denx.de Reviewed-by: Simon Glass --- diff --git a/Makefile b/Makefile index 4b347d3603..9b25536c30 100644 --- a/Makefile +++ b/Makefile @@ -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)