build.config.msm.common: Check for CONFIG_ options which did not apply

Add check for CONFIG_ options that did not apply because they are not
available. The check incorrectly ignored such cases, but this is a valid
warning that should be flagged.

Change-Id: I6991b9af5bbb13c6a2e6e3d58be746660de58bf4
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
This commit is contained in:
Elliot Berman 2021-01-08 14:16:00 -08:00
parent d89a7f1385
commit 24b1fabee7

View File

@ -119,10 +119,10 @@ function check_merged_defconfig() {
local output=$(mktemp)
${KERNEL_DIR}/scripts/diffconfig "${KERNEL_DIR}/arch/${ARCH}/configs/${DEFCONFIG}" ${OUT_DIR}/.config > $output
set +x
if grep -q -v -E -e "^[+-]" $output; then
if grep -q -v -E -e "^\+" $output; then
echo "========================================================"
echo "ERROR! Defconfig fragment did not apply as expected"
grep -v -E -e "^[+-]" $output
grep -v -E -e "^\+" $output
rm $output
exit 1
fi