From 61003ac51b33580726e2f400229455b34cd6794a Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Thu, 14 Apr 2022 12:11:14 -0700 Subject: [PATCH] Revert "build.config.msm.common: Temporarily turn off config delta checks" This reverts commit b1df6fa11bfee1297dad6242ade11dba89a42f5d. Change-Id: I23d7cf95ea62188667ab5eee500ad92d0961bba7 Signed-off-by: Guru Das Srinagesh --- build.config.msm.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.config.msm.common b/build.config.msm.common index 73a7d83ca661..b32abb51b8ad 100644 --- a/build.config.msm.common +++ b/build.config.msm.common @@ -97,7 +97,7 @@ function merge_defconfig_fragments() { ${KERNEL_DIR}/scripts/kconfig/merge_config.sh \ -m -r -y ${DEFCONFIG_FRAGMENTS} | tee $output set +x - if false && grep -q -E -e "Previous value: [^=]+=[ym]" $output; then + if grep -q -E -e "Previous value: [^=]+=[ym]" $output; then echo "========================================================" echo "ERROR! Detected overridden config!" grep -C 1 -E -e "Previous value: [^=]+=[ym]" $output >&2