[PATCH 1/1] UBUNTU: 'fdr editconfig' modification. Easily skip over unwanted menuconfigs.

[Lee Jones]

>
> > 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(-)


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


> > 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:
--------------------------------------------------------------
<snip>
    case "$arch" in
        amd64)    kernarch="x86_64"    ;;
</snip>
--------------------------------------------------------------

The other does neither:
--------------------------------------------------------------
<snip>
    case $config in
    *)
</snip>
--------------------------------------------------------------

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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20100601/1eab87b7/attachment.html>