diff options
| author | Carsten Schlote <schlote@vahanus.net> | 2015-03-04 12:09:37 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-03-26 09:36:26 +0100 |
| commit | ef6961c660de44bb738b67736d38f1fd0b10fce0 (patch) | |
| tree | 46a5e0b6a3b41cc5ff25f91f67599f433c126a17 | |
| parent | ca2eeabccfd464bd5b0cbe0432ba56029ab315b3 (diff) | |
| download | ptxdist-ef6961c660de44bb738b67736d38f1fd0b10fce0.tar.gz ptxdist-ef6961c660de44bb738b67736d38f1fd0b10fce0.tar.xz | |
bash: Renamed option to avoid problem with bash-completion package
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.
Signed-off-by: Carsten Schlote <schlote@vahanus.net>
[mol: add migrate helper]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/bash.in | 2 | ||||
| -rw-r--r-- | rules/bash.make | 2 | ||||
| -rwxr-xr-x | scripts/migrate/migrate_ptx | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/rules/bash.in b/rules/bash.in index b56ac4896..8358510a5 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 b51979448..4c1803801 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 \ diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx index 860d2ed54..f315e6226 100755 --- a/scripts/migrate/migrate_ptx +++ b/scripts/migrate/migrate_ptx @@ -247,3 +247,11 @@ s/^\(\(# \)\?PTXCONF_\)GNUPG\([^\n]*\n\)\(.*\)$/\1GNUPG\3\1GNUPG_GPG\3\4/ # reason : old tool obsolete, new version is from rt-tests # s/^\(\(# \)\?PTXCONF_\)HACKBENCH\(.*\)$/\1RT_TESTS\3\n\1RT_TESTS_HACKBENCH\3/ + +# +# from : ptxdist-2015.02.0 +# to : ptxdist-2015.03.0 +# symbol : BASH_COMPLETION -> BASH_BASHCOMPLETION +# reason : option renamed +# +s/^\(\(# \)\?PTXCONF_\)BASH_COMPLETION/\1BASH_BASHCOMPLETION/ |