mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-19 01:33:27 +08:00
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>
This commit is contained in:
parent
6b4880e63f
commit
c6ecb2f81e
5
Makefile
5
Makefile
@ -1854,11 +1854,10 @@ define filechk_timestamp.h
|
||||
endef
|
||||
|
||||
define filechk_defaultenv.h
|
||||
(grep -v '^#' | \
|
||||
grep -v '^$$' | \
|
||||
( { grep -v '^#' | grep -v '^$$' || true ; echo '' ; } | \
|
||||
tr '\n' '\0' | \
|
||||
sed -e 's/\\\x0\s*//g' | \
|
||||
xxd -i ; echo ", 0x00" ; )
|
||||
xxd -i ; )
|
||||
endef
|
||||
|
||||
define filechk_dt.h
|
||||
|
Loading…
Reference in New Issue
Block a user