From patchwork Wed Oct 28 00:42:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 7505791 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C4FABEEA4 for ; Wed, 28 Oct 2015 00:44:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44157208D1 for ; Wed, 28 Oct 2015 00:44:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54FEB208D0 for ; Wed, 28 Oct 2015 00:44:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753898AbbJ1Aom (ORCPT ); Tue, 27 Oct 2015 20:44:42 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:33813 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754902AbbJ1Amq (ORCPT ); Tue, 27 Oct 2015 20:42:46 -0400 Received: by padhk11 with SMTP id hk11so238190470pad.1 for ; Tue, 27 Oct 2015 17:42:45 -0700 (PDT) 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=Yv+4tbwv6IYvylDmQsnkbeU1yzs3nPidRSR8gYR3Fai7RCHklSmvHIcKDLFPeFx0BE xyljW9IBeIWy2NBllses0ewOJzcZlx4sEJl3HIf0PKu2FMWhrpTSUm7Sdyl/Z3fd53+c X4b1hI2NnLVMtz8woKIGMFWDMmZPkSY3JLHQGkFsk7aOP46qzevu2tyUnMuDJB9/juxn xA7t+LOqpV90zlgBXl3uhOKVfFaa7P+2lcPwtyQvQwXldlCdxUGiHQqVY38XmxQ03li4 IGNJqTRkrOnEtIiGnGSM/lnE9bx/HVyiOe0m6y6ncy4nrKEZlWsJEhX/d1H/OKagLXT6 kw8A== X-Gm-Message-State: ALoCoQkTj5PQ2ppZups8RytJl3apdeRYlcRq2xQ2E1pYbCs8csd6Hf4PUd1laUkqfHHtUM0HmNp/ X-Received: by 10.69.14.101 with SMTP id ff5mr31390425pbd.70.1445992965713; Tue, 27 Oct 2015 17:42:45 -0700 (PDT) Received: from localhost.localdomain ([58.123.138.250]) by smtp.gmail.com with ESMTPSA id t9sm41801385pbs.17.2015.10.27.17.42.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Oct 2015 17:42:44 -0700 (PDT) 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-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Reviewed-by: Darren Hart --- 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