From patchwork Wed May 20 22:00:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 6450481 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E1FB99F1C1 for ; Wed, 20 May 2015 22:04:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D76220450 for ; Wed, 20 May 2015 22:04:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26B48203B0 for ; Wed, 20 May 2015 22:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754591AbbETWEA (ORCPT ); Wed, 20 May 2015 18:04:00 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:34507 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754017AbbETWCj (ORCPT ); Wed, 20 May 2015 18:02:39 -0400 Received: by pdbnk13 with SMTP id nk13so83727805pdb.1 for ; Wed, 20 May 2015 15:02:39 -0700 (PDT) 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=ya/shSQvhc1SFv0y+Lu9LYOKVnjF3wj/JHWUyGa1QNQ=; b=RJIpyjsSbg6Wee21fPhO5+KvoLxGQi9bRqlD7+6Ak9fYBD48xOFFc77SX3zUk1XlXI SYbBVSIctrUF1E10dTlItL4OxT07x8gubCJ9SS5Lv2QxOiliRRExMPAr53lpr3/rfKHh aAB3d6erDEmfvAps/XUO65+zbmuRJGZHt0e0rCxBITMO+tT59YeM6SkKV84iXAL3a/6Q 62ys46UQgqYBV5MhWDXxB659w5kqe5NQfFylM3JJ4dLUSAl74dL2/B31kf/62AQcW9cl KPkFmmZ2DWaHgU0evgqiH3U4dGoLZZLQqi8bAqCybYAB0W6a7XvGaFw+X7DguWzeRC3D wrwg== X-Gm-Message-State: ALoCoQnrdfdKPTL6y+zt3kT7nxG3CJM/CJpacCQxASFza6IvUODSDSwVvGZopgFx7+g6BBiJ1Nxa X-Received: by 10.68.250.194 with SMTP id ze2mr68401253pbc.24.1432159359083; Wed, 20 May 2015 15:02:39 -0700 (PDT) Received: from brutus.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id ux6sm17193507pab.24.2015.05.20.15.02.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 May 2015 15:02:38 -0700 (PDT) From: Olof Johansson To: yann.morin.1998@free.fr Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, dvhart@linux.intel.com, john.stultz@linaro.org, jwboyer@redhat.com, Olof Johansson Subject: [PATCH 05/10] merge_config.sh: Better handling of CONFIG_FOO=n Date: Wed, 20 May 2015 15:00:55 -0700 Message-Id: <1432159260-39390-6-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432159260-39390-1-git-send-email-olof@lixom.net> References: <1432159260-39390-1-git-send-email-olof@lixom.net> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 2364246..81c0b16 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