[PATCH 05/10] merge_config.sh: Better handling of CONFIG_FOO=n

Path	csiph.com!goblin1!goblin2!goblin.stu.neva.ru!aioe.org!bofh.it!news.nic.it!robomod
From	Olof Johansson <olof@lixom.net>
Newsgroups	linux.kernel
Subject	[PATCH 05/10] merge_config.sh: Better handling of CONFIG_FOO=n
Date	Wed, 28 Oct 2015 01:50:01 +0100
Message-ID	<qon69-3PX-3@gated-at.bofh.it> (permalink)
References	<qon69-3PX-5@gated-at.bofh.it>
X-Original-To	Michal Marek <mmarek@suse.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom_net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A0+DORixuhOnehIZGljyF8FNkATsnCSQWIRwy2VRJkE=; b=HeVOqwzZDoB05tVHJFH32diN1kDa3tENFeG2tqmjaCALJxlxrrAU69VAxw4+XkojrS H7shzr5Zw7IV4oJy8s0ecjVaBvkexpVDVSF/xyrExt5NBVnTITmH9lTIHASYIOX4HLIK TYVsmwIuCOT4Vzi9uTVQ05diPmPpWjr0PJDYNuleCb31sNxEdWIp7dEK+EQRkkyjBOVH JkA45OcDHtkmgnFSZdmn9KBawcjWYOh7nQUK9yBxGL91JqkpVxFh2JkWo715rvF/blNT jMm3ogBWm0L/cP/u5rumYAS5NyQaVhqP8G/kW1Egp/o9ppMffsAfpfSKP5tYd3Df+3bN /OeA==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A0+DORixuhOnehIZGljyF8FNkATsnCSQWIRwy2VRJkE=; b=kREpEYCzEZPRdmuXTHlzyw2HpZDTDHYR/YOg26dmCv2GhuPsyi19jdWOzAPbMT7VvO xwuDPcN1etGJm3Rf1Pr51hGx7m5Kx9aCl28/9L1SUNF2W637VNrDXMXQg3atwQzXO0rd kN7+pC2ac7w5yFaYagHvGN9J11VhyPjJRt51GrUPnNVgUNReW5GLM9nWIdOon5vPGvVb aZ7qJNnLxdEdQX9OxvSh/yQ0mWFLU9d67AIQbwzL/Oe6tM45ot3mqlP6rd6shvV+LoTe WWrclejLvQ5HLfqKACxmp/59jGsk73cIJeG+xIWmNr6L6XYTsF8SqIocjAN9trZyIFeM gdEw==
X-Gm-Message-State	ALoCoQmRB2WS63bAVojprhtvKi3AMkAE7+efInv8bQ1qoslSh3GlYjhbSkavWEVM1OCVtj/P+/H6
X-Received	by 10.69.14.101 with SMTP id ff5mr31390425pbd.70.1445992965713; Tue, 27 Oct 2015 17:42:45 -0700 (PDT)
X-Mailer	git-send-email 2.1.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	30
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, dvhart@linux.intel.com, Olof Johansson <olof@lixom.net>
X-Original-Date	Wed, 28 Oct 2015 09:42:06 +0900
X-Original-Message-ID	<1445992931-28107-6-git-send-email-olof@lixom.net>
X-Original-References	<1445992931-28107-1-git-send-email-olof@lixom.net>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1257525

Show key headers only | View raw

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 <olof@lixom.net>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 05/10] merge_config.sh: Better handling of CONFIG_FOO=n Olof Johansson <olof@lixom.net> - 2015-10-28 01:50 +0100
  Re: [PATCH 05/10] merge_config.sh: Better handling of CONFIG_FOO=n Darren Hart <dvhart@infradead.org> - 2015-10-28 07:30 +0100
    Re: [PATCH 05/10] merge_config.sh: Better handling of CONFIG_FOO=n Bruce Ashfield <bruce.ashfield@windriver.com> - 2015-10-28 07:40 +0100

csiph-web