<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Aug 29, 2016 at 5:19 AM, Ioan-Adrian Ratiu <span dir="ltr"><<a href="mailto:adrian.ratiu@ni.com" target="_blank">adrian.ratiu@ni.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">merge_configs.sh calls make on the generated kernel config from<br>
the defconfig + fragments to fill in any missing symbols. make<br>
can fail and this can lead to nasty errors further on in the<br>
build like generating an unbootable kernel image.<br>
<br>
Check the make return code and fail loudly if non-zero.<br></blockquote><div><br></div><div>We don't want merge config to fail in a scenario like this. It is up to whatever</div><div>calls merge_config to add that sort of logic. Which is what I do with the kernel</div><div>audit phase of linux-yocto.</div><div><br></div><div>If you do want to try and make it fail in a scenario like this, the patch needs to</div><div>go to the linux kernel mailing list.</div><div><br></div><div>Cheers,</div><div><br></div><div>Bruce</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Signed-off-by: Ioan-Adrian Ratiu <<a href="mailto:adrian.ratiu@ni.com">adrian.ratiu@ni.com</a>><br>
---<br>
tools/merge_config.sh | 5 ++++-<br>
1 file changed, 4 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/tools/merge_config.sh b/tools/merge_config.sh<br>
index 67d1314..5212f37 100755<br>
--- a/tools/merge_config.sh<br>
+++ b/tools/merge_config.sh<br>
@@ -152,7 +152,10 @@ fi<br>
# alldefconfig: Fills in any missing symbols with Kconfig default<br>
# allnoconfig: Fills in any missing symbols with # CONFIG_* is not set<br>
make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET<br>
-<br>
+if [ "$?" -ne 0 ]; then<br>
+ echo "Make failed to fill missing config symbols. Exit." >&2<br>
+ exit 1<br>
+fi </blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
# Check all specified config values took (might have missed-dependency issues)<br>
for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.9.3<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"</div>
</div></div>