From patchwork Thu Dec 1 19:50:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 5426 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D2BC323E10 for ; Thu, 1 Dec 2011 19:51:17 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id B322DA18443 for ; Thu, 1 Dec 2011 19:51:17 +0000 (UTC) Received: by laah2 with SMTP id h2so1280190laa.11 for ; Thu, 01 Dec 2011 11:51:17 -0800 (PST) Received: by 10.152.135.179 with SMTP id pt19mr5690814lab.47.1322769077345; Thu, 01 Dec 2011 11:51:17 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs83180lal; Thu, 1 Dec 2011 11:51:16 -0800 (PST) Received: by 10.236.124.17 with SMTP id w17mr13962092yhh.126.1322769074157; Thu, 01 Dec 2011 11:51:14 -0800 (PST) Received: from e9.ny.us.ibm.com (e9.ny.us.ibm.com. [32.97.182.139]) by mx.google.com with ESMTPS id b11si2680437ane.175.2011.12.01.11.51.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Dec 2011 11:51:14 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.139 as permitted sender) client-ip=32.97.182.139; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.139 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 1 Dec 2011 14:51:12 -0500 Received: from d01relay04.pok.ibm.com (9.56.227.236) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 1 Dec 2011 14:51:10 -0500 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pB1Jp5L9214476; Thu, 1 Dec 2011 14:51:06 -0500 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pB1Jp1so007033; Thu, 1 Dec 2011 12:51:01 -0700 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pB1Jp1D9006972; Thu, 1 Dec 2011 12:51:01 -0700 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 8815F1E74FB; Thu, 1 Dec 2011 11:51:00 -0800 (PST) From: John Stultz To: Linux Kernel Mailing List Cc: John Stultz , Andrew Morton , Darren Hart , Michal Marek , Arnaud Lacombe Subject: [PATCH] merge_config.sh: Fix bug in final check Date: Thu, 1 Dec 2011 11:50:53 -0800 Message-Id: <1322769053-25038-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 x-cbid: 11120119-7182-0000-0000-00000052982F Hey Andrew, Arnaud Lacombe pointed out the final checking that the requested configs were included in the final .config was broken. The example was that if you had a fragment that disabled CONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no final warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final .config. This bug was introduced by me in v3 of the original patch, and the following patch reverts the invalid change. CC: Andrew Morton CC: Darren Hart CC: Michal Marek CC: Arnaud Lacombe Reported-by: Arnaud Lacombe Signed-off-by: John Stultz --- scripts/kconfig/merge_config.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 890276b..6f12fb3 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -104,8 +104,8 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $ALLTARGET # Check all specified config values took (might have missed-dependency issues) for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do - REQUESTED_VAL=$(sed -n "$SED_CONFIG_EXP" $TMP_FILE | grep -w -e "$CFG") - ACTUAL_VAL=$(sed -n "$SED_CONFIG_EXP" .config | grep -w -e "$CFG") + REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE) + ACTUAL_VAL=$(grep -w -e "$CFG" .config) if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then echo "Value requested for $CFG not in final .config" echo "Requested value: $REQUESTED_VAL"