mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: carsten.schlote@gmx.net
To: ptxdist@pengutronix.de
Cc: Carsten Schlote <schlote@vahanus.net>
Subject: [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package
Date: Wed,  4 Mar 2015 12:09:37 +0100	[thread overview]
Message-ID: <1425467377-7470-3-git-send-email-carsten.schlote@gmx.net> (raw)
In-Reply-To: <1425467377-7470-1-git-send-email-carsten.schlote@gmx.net>

From: Carsten Schlote <schlote@vahanus.net>

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>
---
 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
ptxdist@pengutronix.de

  parent reply	other threads:[~2015-03-04 11:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-04 11:09 [ptxdist] Updated bash to release 4.3.30 and other cleanups carsten.schlote
2015-03-04 11:09 ` [ptxdist] [PATCH 1/2] bash: Updated the bash shell to release 4.3.30 carsten.schlote
2015-03-26  9:11   ` Michael Olbrich
2015-03-04 11:09 ` carsten.schlote [this message]
2015-03-26  9:12   ` [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1425467377-7470-3-git-send-email-carsten.schlote@gmx.net \
    --to=carsten.schlote@gmx.net \
    --cc=ptxdist@pengutronix.de \
    --cc=schlote@vahanus.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox