From patchwork Tue Jun 1 09:46:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 54163 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id DC195B7D30 for ; Tue, 1 Jun 2010 19:46:25 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OJO33-0003RX-Gv; Tue, 01 Jun 2010 10:46:13 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OJO31-0003QL-90 for kernel-team@lists.ubuntu.com; Tue, 01 Jun 2010 10:46:11 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OJO31-0003b3-0m; Tue, 01 Jun 2010 10:46:11 +0100 Received: from cpc2-aztw21-0-0-cust264.aztw.cable.virginmedia.com ([77.100.97.9] helo=[192.168.0.130]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OJO30-0007bs-8a; Tue, 01 Jun 2010 10:46:10 +0100 Message-ID: <4C04D6E3.3070205@canonical.com> Date: Tue, 01 Jun 2010 10:46:11 +0100 From: Lee Jones User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100423 Thunderbird/3.0.4 MIME-Version: 1.0 To: kernel-team , Chase Douglas Subject: Re: [PATCH 1/1] UBUNTU: 'fdr editconfig' modification. Easily skip over unwanted menuconfigs. References: <4C0235A8.40406@canonical.com> <1275232180.6666.14.camel@mini> In-Reply-To: <1275232180.6666.14.camel@mini> X-Enigmail-Version: 1.0.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com > > > A few notes: > > > > I don't think we would generally consider changes like this to a > > released kernel, so this should probably be applied to maverick. If we > > do want to put it in lucid, it makes sense to first put it in maverick > > anyways. As a side note, because we maintain many branches of releases, > > it helps to prepend the email subject line with "[MAVERICK]" so everyone > > knows what the patch is for. > > > I have seen the "[LUCID]" and "[MAVERICK]" tags and did contemplate using them, but I had no idea where this patch should go, so intentionally omitted them. > > There's a lot of whitespace changes here. If you meant to introduce > > formatting changes, it's best to do so as a separate patch. > Noted. > > Now I can better tell what's going on :). This seems good to me. The > > previous behavior is maintained (press enter to edit the config file), > > while giving the user the option to skip editing if they know nothing > > should change. > Thank you. That is the behavior I intended. > > If you can resend a patch like this with only the salient > > changes I will ACK it. > How's this: The following changes since commit f0819aaf4948e34a44d9d685615ddee74271cd70: Chase Douglas (1): UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y are available in the git repository at: git://kernel.ubuntu.com/lag/ubuntu-lucid.git editconfig Lee Jones (1): UBUNTU: 'fdr editconfig' modification. Easily skip over unwanted menuconfigs. debian/scripts/misc/kernelconfig | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) > > hen you do, please check that your indentation > > style matches the style used throughout the rules files. I'm not sure > > the above is conforming. > > > This is an odd one, as the original file did not conform, even to itself. For instance; the two case statements: One indents and uses quotes around the variable: -------------------------------------------------------------- case "$arch" in amd64) kernarch="x86_64" ;; -------------------------------------------------------------- The other does neither: -------------------------------------------------------------- case $config in *) -------------------------------------------------------------- The remainder of the kernel doesn't indent, but does use quotes and Emacs tells me it should be indented. Your call? Kind regards, Lee diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index 71c0f5e..3181978 100755 (executable) --- a/debian/scripts/misc/kernelconfig +++ b/debian/scripts/misc/kernelconfig @@ -51,9 +51,6 @@ for arch in $archs; do *) kernarch="$arch" ;; esac - echo "" - echo "***************************************" - echo "* Processing $arch ($kernarch) ... " archconfdir=$confdir/$arch flavourconfigs=$(cd $archconfdir && ls config.flavour.*) @@ -96,9 +93,21 @@ for arch in $archs; do make O=`pwd`/build ARCH=$kernarch oldconfig ;; editconfig) # Interactively edit config parameters - echo " * Run menuconfig on $arch/$config... Press a key." - read - make O=`pwd`/build ARCH=$kernarch menuconfig ;; + while : ; do + echo -n "Do you want to edit config: $arch/$config? [Y/n] " + read choice + + case "$choice" in + y* | Y* | "" ) + make O=`pwd`/build ARCH=$kernarch menuconfig + break ;; + n* | N* ) + break ;; + *) + echo "Entry not valid" + esac + done + ;; *) # Bad! exit 1 ;; esac