]> git.dujemihanovic.xyz Git - u-boot.git/commit
Makefile: fix generation of defaultenv.h from empty initial file
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>
Thu, 22 Apr 2021 07:44:18 +0000 (09:44 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 27 Apr 2021 12:05:30 +0000 (08:05 -0400)
commit7ac7038ab36feff54e882422de0f3127db094565
tree3b24b2eb2f4676e921398b28b133f2d90cd1e1e7
parentdae9aeda45277de24161d0f68f1a9468758f166e
Makefile: fix generation of defaultenv.h from empty initial file

When CONFIG_USE_DEFAULT_ENV_FILE=y and the file
CONFIG_DEFAULT_ENV_FILE is empty (or at least doesn't contain any
non-comment, non-empty lines), we end up feeding nothing into xxd,
which in turn then outputs nothing. Then blindly appending ", 0x00"
means that we end up trying to compile (roughly)

const char defaultenv[] = { , 0x00 }

which is of course broken.

To fix that, change the frobbing of the text file so that we always
end up printing an extra empty line (which gets turned into that extra
nul byte we need) - that corresponds better to the binary format
consisting of a series of key=val nul terminated strings, terminated
by an empty string.

Reported-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Makefile