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

[Chase Douglas]

On Tue, 2010-06-01 at 10:46 +0100, Lee Jones wrote:
> 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.

Very little goes directly into an already released kernel. Usually, bug
fixes are sent to stable at kernel.org, then trickle back down to us. If
the change fixes a really important issue, then we may take it in before
that, but this is the exception rather than the rule.

For development kernels, things are usually flipped. We normally apply
changes as we submit them to the stable queue upstream.

In this instance, where you're resubmitting a patch, I would send it as
a new email (not a reply) with something like the following for a
subject:

[MAVERIC][PATCH v3] UBUNTU: 'fdr editconfig' modification. Easily skip
over unwanted menuconfigs.

Generally, the patch numbering is omitted in a single patch instance.

> 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

This needs to be applied to the maverick source tree instead.

> 
> 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.

It's no fun when things aren't standardized :). I would just try to
reproduce the same style as the code around your changes. In this
instance, the only thing that stands out to me is the case statement
should be like:

case "$choice" in
    y* | Y* | "" )
        make O=`pwd`/build ARCH=$kernarch menuconfig
        break ;;

This wouldn't be my first choice, but it's better to keep things
consistent so it's readable. Other than that, I think everything is
good.

-- Chase