From patchwork Wed May 20 22:00:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 6450501 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 366249F1C1 for ; Wed, 20 May 2015 22:04:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67584203ED for ; Wed, 20 May 2015 22:04:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DD5B203B0 for ; Wed, 20 May 2015 22:04:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753649AbbETWD7 (ORCPT ); Wed, 20 May 2015 18:03:59 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:35034 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753647AbbETWCk (ORCPT ); Wed, 20 May 2015 18:02:40 -0400 Received: by pdea3 with SMTP id a3so83654016pde.2 for ; Wed, 20 May 2015 15:02:40 -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=Bs/g0pF2AqAJJ9dfTDCTcvsoGysdn+FIz98IfT951qM=; b=KUStWOITZFkJ2moKYk3kmXNdC825fmUZ/en8WtoJgxft0rnAYNUI8bHUZL6/oZ6ufX kXJ4zrhWoa37fmDY5Jpp2syB61IhGOY9HQwlbvcGpE7gbjO7YxFCE+Gv15zmZ5dD1fUM tFk/jkcvRRzhKmCZIONeYyXJ1Qu4ZlzpOaxs2XmyxlQGX2dzfismW1PyVb75tD/4asr8 4AWEq/PrxXG8HWQ/J3daw+m6WxcC3IfKp3/U//92+Hg8/yPb4w1jYkl3FwlXzLc0NnJO L0sbLAW5S2z3uGdbW4LCEZiuY6HSSt8V/Y10DQB5hdFP+qK1oEnLdLX7w6PQ1NtF0JdG tM3g== X-Gm-Message-State: ALoCoQmlVBqCNKIZSpUdLxRqU+sdd094hyldara2q/hdYDg5stOoaaVz/Vw/8tT3i8UxC1Q1dvMV X-Received: by 10.70.38.195 with SMTP id i3mr68155689pdk.82.1432159360409; Wed, 20 May 2015 15:02:40 -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.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 May 2015 15:02:39 -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 06/10] merge_config.sh: only consider last value of symbols Date: Wed, 20 May 2015 15:00:56 -0700 Message-Id: <1432159260-39390-7-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 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 81c0b16..932fd52 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -39,7 +39,7 @@ usage() { } getval() { - grep -w -e "$1" "$2" | sed 's/^CONFIG_\(.*\)=n$/# CONFIG_\1 is not set/g' + grep -w -e "$1" "$2" | tail -1 | sed 's/^CONFIG_\(.*\)=n/# CONFIG_\1 is not set/g' } CONF_IS_ERR=false