On Wed, Mar 04, 2015 at 12:09:37PM +0100, [email protected] wrote: > From: Carsten Schlote <[email protected]> > > This patch just changes the name of some bash config option, so that the > bash-completion package won't conflict with the bash package anymore.
Thanks, applied with an added migrate helper. Michael > Signed-off-by: Carsten Schlote <[email protected]> > --- > rules/bash.in | 2 +- > rules/bash.make | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rules/bash.in b/rules/bash.in > index beb35c5..059bc9d 100644 > --- a/rules/bash.in > +++ b/rules/bash.in > @@ -186,7 +186,7 @@ config BASH_PROCSUBST > named pipes (FIFOs) or the '/dev/fd' method of naming open > files. It takes the form of <(list) or >(list). > > -config BASH_COMPLETION > +config BASH_BASHCOMPLETION > bool > prompt "Enable programmable completion" > help > diff --git a/rules/bash.make b/rules/bash.make > index 238eb75..a29c9c6 100644 > --- a/rules/bash.make > +++ b/rules/bash.make > @@ -63,7 +63,7 @@ BASH_AUTOCONF := \ > --$(call ptx/endis, PTXCONF_BASH_MULTIBYTE)-multibyte \ > --disable-net-redirections \ > --$(call ptx/endis, PTXCONF_BASH_PROCSUBST)-process-substitution \ > - --$(call ptx/endis, PTXCONF_BASH_COMPLETION)-progcomp \ > + --$(call ptx/endis, PTXCONF_BASH_BASHCOMPLETION)-progcomp \ > --$(call ptx/endis, PTXCONF_BASH_ESC)-prompt-string-decoding \ > --$(call ptx/endis, PTXCONF_BASH_EDIT)-readline \ > --$(call ptx/endis, PTXCONF_BASH_RESTRICTED)-restricted \ > -- > 2.3.1 > > > -- > ptxdist mailing list > [email protected] > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list [email protected]
