merge_configs.sh calls make on the generated kernel config from the defconfig + fragments to fill in any missing symbols. make can fail and this can lead to nasty errors further on in the build like generating an unbootable kernel image.
Check the make return code and fail loudly if non-zero. Signed-off-by: Ioan-Adrian Ratiu <adrian.ra...@ni.com> --- tools/merge_config.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/merge_config.sh b/tools/merge_config.sh index 67d1314..5212f37 100755 --- a/tools/merge_config.sh +++ b/tools/merge_config.sh @@ -152,7 +152,10 @@ fi # alldefconfig: Fills in any missing symbols with Kconfig default # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET - +if [ "$?" -ne 0 ]; then + echo "Make failed to fill missing config symbols. Exit." >&2 + exit 1 +fi # Check all specified config values took (might have missed-dependency issues) for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do -- 2.9.3 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
