From patchwork Thu Dec 11 20:55:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 5477591 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 25349BEEA8 for ; Thu, 11 Dec 2014 20:58:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47CBC20160 for ; Thu, 11 Dec 2014 20:58:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 669312010B for ; Thu, 11 Dec 2014 20:58:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933570AbaLKUwx (ORCPT ); Thu, 11 Dec 2014 15:52:53 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:52148 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933245AbaLKUwv (ORCPT ); Thu, 11 Dec 2014 15:52:51 -0500 Received: by mail-pa0-f48.google.com with SMTP id rd3so5765938pab.21 for ; Thu, 11 Dec 2014 12:52:50 -0800 (PST) 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=chk9oVjNnWRhsTbFpODHOm1bYM0h/efAYbPN4qbHuiE=; b=Qq3sQkOOww2BUVZp1S8pa8A8FB0fLDDEPZ7ynGLfciIYEAIjgf9t2bRTEoPj/Ilv1P jdCBNWdZHRyabpeewIONGx8RSyMMQm9SYnHS4Jbu76SjvUlNcrNhPEU8Q5bgef+2vSTC 9w4uMiXe6PlCem3kvJ9Z7UijVMgkjH24qguA6rHqTEbXjUppK6MYe9xIHXm0yEFjD9f4 eAWhmh5rfrS4bCaUg1lS7eVZuAB7ZGgIOVcxRAkOcNnrTLWcnZfdv0mJ3ssbewc+E8Cy tubRi90LFBanKeO+knxZX7A5czM6Bjb92TU0DHi3rbUX+1g6GHPO2ZCl0yTkxL6KxJjG /KKw== X-Gm-Message-State: ALoCoQmrzeR22+JN01iXoliUarlEzrTLuLsvwyDHiM8s55pfjVjBupj7z5O5L08HZfnRwfOTpV9t X-Received: by 10.70.92.100 with SMTP id cl4mr20284595pdb.151.1418331170613; Thu, 11 Dec 2014 12:52:50 -0800 (PST) Received: from brutus.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id pc8sm2150902pdb.54.2014.12.11.12.52.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Dec 2014 12:52:49 -0800 (PST) From: Olof Johansson To: yann.morin.1998@free.fr Cc: linux-kbuild@vger.kernel.org, dvhart@linux.intel.com, linux-kernel@vger.kernel.org, Olof Johansson Subject: [PATCH 2/2] merge_config.sh: add -? for help Date: Thu, 11 Dec 2014 12:55:04 -0800 Message-Id: <1418331304-4821-2-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1418331304-4821-1-git-send-email-olof@lixom.net> References: <1418331304-4821-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 It's usual enough for help text that it makes sense to support it. Signed-off-by: Olof Johansson Acked-by: Darren Hart --- scripts/kconfig/merge_config.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 2ab91b9..0c89537 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -28,11 +28,11 @@ trap clean_up HUP INT TERM usage() { echo "Usage: $0 [OPTIONS] [CONFIG [...]]" - 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 entries when merging fragments" - echo " -O dir to put generated output files" + echo " -h or -? 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 entries when merging fragments" + echo " -O dir to put generated output files" } MAKE=true @@ -52,7 +52,7 @@ while true; do shift continue ;; - "-h") + "-h"|"-?") usage exit ;;