From patchwork Sun May 30 15:09:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 54000 X-Patchwork-Delegate: apw@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 4BE5BB7D51 for ; Mon, 31 May 2010 01:09:58 +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 1OIk95-0004wo-JQ; Sun, 30 May 2010 16:09:47 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OIk93-0004wX-JW for kernel-team@lists.ubuntu.com; Sun, 30 May 2010 16:09:45 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OIk93-0004Jn-HV; Sun, 30 May 2010 16:09:45 +0100 Received: from cpe-75-180-27-10.columbus.res.rr.com ([75.180.27.10] helo=[10.0.1.24]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OIk93-0007GS-A2; Sun, 30 May 2010 16:09:45 +0100 Subject: Re: [PATCH 1/1] UBUNTU: 'fdr editconfig' modification. Easily skip over unwanted menuconfigs. From: Chase Douglas To: Lee Jones In-Reply-To: <4C0235A8.40406@canonical.com> References: <4C0235A8.40406@canonical.com> Date: Sun, 30 May 2010 11:09:40 -0400 Message-ID: <1275232180.6666.14.camel@mini> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Cc: kernel-team 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: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com On Sun, 2010-05-30 at 10:53 +0100, Lee Jones wrote: > All, > > It is now easier to edit 'per-flavour' configuration files. The old > system forced the developer to enter a menuconfig system for each > flavour until eventually landing in the required one. After following > this process numerous times it can easily become tedious. Now the > developer is asked whether they want to enter each menuconfig in turn, > rapidly speeding up the process. 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. 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. If not, then your editor may be munging things. The inlined diff was munged as well. If you're using evolution, check that when you insert the text the style dropdown box is changed from Normal to Preformatted. I took your patch, applied it to ubuntu-maverick, then did a "git diff -w HEAD^" to take a look at what really changed: 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. If you can resend a patch like this with only the salient changes I will ACK it. When you do, please check that your indentation style matches the style used throughout the rules files. I'm not sure the above is conforming. Thanks, -- Chase diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index 71c0f5e..7884bdc 100755 --- 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