From patchwork Thu Mar 22 22:05:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 7424 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 716E123E47 for ; Thu, 22 Mar 2012 22:06:28 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 395E5A1844B for ; Thu, 22 Mar 2012 22:06:28 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so4904261iag.11 for ; Thu, 22 Mar 2012 15:06:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=yGe9GfgmEXSwaJM/8HX/xJHsQNJ67N/EOQeGSeYETd4=; b=mrBaJNKaY3z0moaUzhtrwh20vS9HskPcrJRNMcdAk2yzawMQI4yhCLnSipiZb66J1R XnJsCoitlzx/E9ZREjWSZDR7Z6zXcRF9efpbHyWX64mKSWeerAVHUVJJ0smHKYwd+IZY 0gOpkTtN7iZ4ABn7idoqjIJDu2aZmHAmBcOE0W7CbkPAxwMuI+H8TbNy9vN9P5VdYVD4 AKxWic0CqStLLrHl8K5oOI8Vl+2X4jIJCpbNj1PMWdCBF143BWy1VvLE+kOxOIIKYca/ lyUOUm+XErpW9te0qgDoP4oU6VdFoDDdxhkU5Ga4tLBDG6oPTnCwZ7aHzcYHwuWkWecb 2EDQ== Received: by 10.42.72.130 with SMTP id o2mr6964553icj.8.1332453988023; Thu, 22 Mar 2012 15:06:28 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.203.79 with SMTP id fh15csp8060ibb; Thu, 22 Mar 2012 15:06:26 -0700 (PDT) Received: by 10.68.236.3 with SMTP id uq3mr23733558pbc.63.1332453986194; Thu, 22 Mar 2012 15:06:26 -0700 (PDT) Received: from e39.co.us.ibm.com (e39.co.us.ibm.com. [32.97.110.160]) by mx.google.com with ESMTPS id j5si7072199pbl.32.2012.03.22.15.06.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 15:06:25 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.160 as permitted sender) client-ip=32.97.110.160; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.160 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 22 Mar 2012 16:06:23 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 22 Mar 2012 16:06:12 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 4932D1FF0059; Thu, 22 Mar 2012 16:06:11 -0600 (MDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2MM5vW9071596; Thu, 22 Mar 2012 16:05:57 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2MM5raN022254; Thu, 22 Mar 2012 16:05:53 -0600 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q2MM5qEP022226; Thu, 22 Mar 2012 16:05:52 -0600 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 06316C04BD; Thu, 22 Mar 2012 15:05:51 -0700 (PDT) From: John Stultz To: linux-kbuild@vger.kernel.org Cc: John Stultz , Michal Marek , Bruce.Ashfield@windriver.com, Darren Hart Subject: [PATCH 2/2] merge_config.sh: Add option to display redundant configs Date: Thu, 22 Mar 2012 15:05:49 -0700 Message-Id: <1332453949-5872-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1332453949-5872-1-git-send-email-john.stultz@linaro.org> References: <1332453949-5872-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12032222-4242-0000-0000-000001213737 X-Gm-Message-State: ALoCoQk7jg3DHykKoSXr+CBD6l3oSpe7WdCGemCiWu2GU3o5QfGsOLba1kh3J0lp9kx0oG6OTUwx Provide a -r option to display when fragments contain reundent options CC: Michal Marek CC: Bruce.Ashfield@windriver.com CC: Darren Hart Signed-off-by: John Stultz --- scripts/kconfig/merge_config.sh | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index ceadf0e..d92edc3 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -31,10 +31,12 @@ usage() { echo " -h display this help text" echo " -m only merge the fragments, do not execute the make command" echo " -n use allnoconfig instead of alldefconfig" + echo " -r list redundant enteries when merging fragments" } MAKE=true ALLTARGET=alldefconfig +WARNREDUN=false while true; do case $1 in @@ -52,6 +54,11 @@ while true; do usage exit ;; + "-r") + WARNREDUN=true + shift + continue + ;; *) break ;; @@ -79,6 +86,10 @@ for MERGE_FILE in $MERGE_LIST ; do echo Previous value: $PREV_VAL echo New value: $NEW_VAL echo + else + if [ "$WARNREDUN" = "true" ]; then + echo Value of $CFG is redundant by fragment $MERGE_FILE: + fi fi sed -i "/$CFG[ =]/d" $TMP_FILE fi