From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932224AbbJ1Aoo (ORCPT ); Tue, 27 Oct 2015 20:44:44 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:35167 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754908AbbJ1Amq (ORCPT ); Tue, 27 Oct 2015 20:42:46 -0400 From: Olof Johansson To: Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, dvhart@linux.intel.com, Olof Johansson Subject: [PATCH 05/10] merge_config.sh: Better handling of CONFIG_FOO=n Date: Wed, 28 Oct 2015 09:42:06 +0900 Message-Id: <1445992931-28107-6-git-send-email-olof@lixom.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445992931-28107-1-git-send-email-olof@lixom.net> References: <1445992931-28107-1-git-send-email-olof@lixom.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Kconfig knows how to handle CONFIG_FOO=n just fine, but it'll always use "# CONFIG FOO is not set" in the resulting config. Mangle the input accordingly so we don't report this as a failure when it isn't. Signed-off-by: Olof Johansson --- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index c244042..933f2d6 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -39,7 +39,7 @@ usage() { } getval() { - grep -w -e "$1" "$2" + grep -w -e "$1" "$2" | sed 's/^CONFIG_\(.*\)=n$/# CONFIG_\1 is not set/g' } CONF_IS_ERR=false -- 2.1.4