mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] Updated bash to release 4.3.30 and other cleanups
@ 2015-03-04 11:09 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-04 11:09 ` [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package carsten.schlote
  0 siblings, 2 replies; 5+ messages in thread
From: carsten.schlote @ 2015-03-04 11:09 UTC (permalink / raw)
  To: ptxdist


Hi list,

this is the second release of a patch stack to update the bash shell to
some recent version.

I needed that to support recent stuff found with systemd or bash completion. 

This second patch stack also removes some obsolete/redundant dependency statements
in the config.in file.                 

Also an option is renamed to avoid name collisions with the bash-completion
package, which I currently add to and test on ptxdist.

Carsten

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [ptxdist] [PATCH 1/2] bash: Updated the bash shell to release 4.3.30
  2015-03-04 11:09 [ptxdist] Updated bash to release 4.3.30 and other cleanups carsten.schlote
@ 2015-03-04 11:09 ` carsten.schlote
  2015-03-26  9:11   ` Michael Olbrich
  2015-03-04 11:09 ` [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package carsten.schlote
  1 sibling, 1 reply; 5+ messages in thread
From: carsten.schlote @ 2015-03-04 11:09 UTC (permalink / raw)
  To: ptxdist; +Cc: Carsten Schlote

From: Carsten Schlote <schlote@vahanus.net>

systemd seems to use modern bash features like readarray, which is not
provided by version 3.2.48 on current ptxdist.

So I updated the bash package to a more recent bash version.

The config fragment was updated with actual configure arguments, so that bash
should be configurable similiar as for 3.2 version.

Removed unneeded dependency statements and other tweaks like unconditionally
selecting BASH_CONDITIONAL.

The patches for version 3.2.48 are dropped as these patches are no longer
needed for version 4.3. At least I got told so.

Signed-off-by: Carsten Schlote <schlote@vahanus.net>
---
 rules/bash.in   | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 rules/bash.make | 29 ++++++++++++++++++-----
 2 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/rules/bash.in b/rules/bash.in
index 8295ad5..beb35c5 100644
--- a/rules/bash.in
+++ b/rules/bash.in
@@ -4,8 +4,6 @@ menuconfig BASH
 	select LIBC_DL
 	select GCCLIBS_GCC_S
 	select NCURSES if BASH_CURSES
-	# disabling this is currently broken
-	select BASH_CONDITIONAL
 	help
 	  The GNU Bourne Again SHell
 	  Bash is an sh-compatible command language interpreter that executes
@@ -47,7 +45,6 @@ config BASH_ALIASES
 config BASH_ARITHMETIC_FOR
 	bool
 	prompt "Enable arithmetic for command"
-	depends on BASH
 	help
 	  Include support for the alternate form of the for command that
 	  behaves like the C language for statement.
@@ -76,11 +73,40 @@ config BASH_BRACE
 	  to pathname expansion, but the filenames generated
 	  need not exist.
 
+config BASH_CASEMODATTR
+	bool
+	prompt "include case-modifying variable attributes"
+
+config BASH_CASEMODEXP
+	bool
+	prompt "include case-modifying word expansions"
+
+config BASH_CMDTIMING
+	bool
+	prompt "enable the time reserved word and command timing"
+
 config BASH_CONDITIONAL
 	bool
 	default y
 	prompt "Enable the conditional command"
-	depends on BASH
+
+config BASH_CONDITIONAL_REGEX
+	bool
+	prompt "enable extended regular expression matching in conditional commands"
+	depends on BASH_CONDITIONAL
+
+config BASH_COPROCESSES
+	bool
+	default y
+	prompt "enable coprocess support and the coproc reserved word"
+
+config BASH_DEBUGGER
+	bool
+	prompt "enable support for bash debugger"
+
+config BASH_DIREXPDEFLT
+	bool
+	prompt "enable the direxpand shell option by default"
 
 config BASH_DIRSTACK
 	bool
@@ -94,11 +120,29 @@ config BASH_DIRSTACK
 	   added to the list with the pushd command;
 	   the popd command removes entries from the list.
 
+config BASH_DISABLED_BUILDINS
+	bool
+	prompt "Allow disabled builtins to still be invoked"
+
+config BASH_DPARAN_ARITH
+	bool
+	prompt "include ((...)) command"
+	default y
+
 config BASH_EXTPATTERN
 	bool
-#	default y
 	prompt "Include ksh-style extended pattern matching"
-	depends on BASH
+
+config BASH_EXTPATTERN_DEFLT
+	bool
+	prompt "force extended pattern matching to be enabled by default"
+
+config BASH_GLOB_ASCIIRANGE_DEFLT
+	bool
+	prompt "bracket range pattern matching uses C locale"
+	help
+	  force bracket range expressions in pattern matching to use the C
+	  locale by default
 
 config BASH_HELP
 	bool
@@ -124,6 +168,13 @@ config BASH_JOBS
 	  This enables support for background jobs in bash.
 	  You can list the actual managed jobs by the "jobs" command.
 
+config BASH_MULTIBYTE
+	bool
+	prompt "Enable multibyte characters"
+	default y
+	help
+	  Enable multibyte characters if OS supports them.
+
 config BASH_PROCSUBST
 	bool
 	prompt "Enable process substitution"
@@ -179,6 +230,14 @@ config BASH_SELECT
 	  Include the select builtin, which allows the generation of
 	  simple menus.
 
+config BASH_SEP_HELPFILES
+	bool
+	prompt "use external files for help builtin documentation"
+
+config BASH_SINGLE_HELPLINE
+	bool
+	prompt "store help documentation as a single string to ease translation"
+
 endif
 
 config BASH_GPROF
diff --git a/rules/bash.make b/rules/bash.make
index 18d59ea..238eb75 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BASH) += bash
 #
 # Paths and names
 #
-BASH_VERSION	:= 3.2.48
-BASH_MD5	:= 338dcf975a93640bb3eaa843ca42e3f8
+BASH_VERSION	:= 4.3.30
+BASH_MD5	:= a27b3ee9be83bd3ba448c0ff52b28447
 BASH		:= bash-$(BASH_VERSION)
 BASH_SUFFIX	:= tar.gz
 BASH_URL	:= $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX))
@@ -37,28 +37,45 @@ BASH_AUTOCONF	:= \
 	$(CROSS_AUTOCONF_ROOT) \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--without-bash-malloc \
-	--disable-net-redirections \
 	--$(call ptx/endis, PTXCONF_BASH_SHLIKE)-minimal-config \
 	--$(call ptx/endis, PTXCONF_BASH_ALIASES)-alias \
 	--$(call ptx/endis, PTXCONF_BASH_ARITHMETIC_FOR)-arith-for-command \
 	--$(call ptx/endis, PTXCONF_BASH_ARRAY)-array-variables \
 	--$(call ptx/endis, PTXCONF_BASH_HISTORY)-bang-history \
 	--$(call ptx/endis, PTXCONF_BASH_BRACE)-brace-expansion \
+	--$(call ptx/endis, PTXCONF_BASH_CASEMODATTR)-casemod-attributes \
+	--$(call ptx/endis, PTXCONF_BASH_CASEMODEXP)-casemod-expansions \
+	--$(call ptx/endis, PTXCONF_BASH_CMDTIMING)-command-timing \
 	--$(call ptx/endis, PTXCONF_BASH_CONDITIONAL)-cond-command \
+	--$(call ptx/endis, PTXCONF_BASH_CONDITIONAL_REGEX)-cond-regexp \
+	--$(call ptx/endis, PTXCONF_BASH_COPROCESSES)-coprocesses \
+	--$(call ptx/endis, PTXCONF_BASH_DEBUGGER)-debugger \
+	--$(call ptx/endis, PTXCONF_BASH_DIREXPDEFLT)-direxpand-default \
 	--$(call ptx/endis, PTXCONF_BASH_DIRSTACK)-directory-stack \
+	--$(call ptx/endis, PTXCONF_BASH_DISABLED_BUILDINS)-disabled-builtins \
+	--$(call ptx/endis, PTXCONF_BASH_DPARAN_ARITH)-dparen-arithmetic \
 	--$(call ptx/endis, PTXCONF_BASH_EXTPATTERN)-extended-glob \
+	--$(call ptx/endis, PTXCONF_BASH_EXTPATTERN_DEFLT)-extended-glob-default \
+	--$(call ptx/endis, PTXCONF_BASH_GLOB_ASCIIRANGE_DEFLT)-glob-asciiranges-default \
 	--$(call ptx/endis, PTXCONF_BASH_HELP)-help-builtin \
 	--$(call ptx/endis, PTXCONF_BASH_CMDHISTORY)-history \
 	--$(call ptx/endis, PTXCONF_BASH_JOBS)-job-control \
+	--$(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_ESC)-prompt-string-decoding \
 	--$(call ptx/endis, PTXCONF_BASH_EDIT)-readline \
 	--$(call ptx/endis, PTXCONF_BASH_RESTRICTED)-restricted \
 	--$(call ptx/endis, PTXCONF_BASH_SELECT)-select \
-	--$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \
-	--$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link \
-	--$(call ptx/endis, PTXCONF_BASH_CURSES)-curses
+	--$(call ptx/endis, PTXCONF_BASH_SEP_HELPFILES)-separate-helpfiles \
+	--$(call ptx/endis, PTXCONF_BASH_SINGLE_HELPLINE)-single-help-strings \
+ 	--$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \
+	--$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link
+
+ifdef PTXCONF_BASH_CURSES
+BASH_AUTOCONF += --with-curses
+endif
 
 ifdef PTXCONF_BASH_JOBS
 BASH_ENV	+= bash_cv_job_control_missing=present
-- 
2.3.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package
  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-04 11:09 ` carsten.schlote
  2015-03-26  9:12   ` Michael Olbrich
  1 sibling, 1 reply; 5+ messages in thread
From: carsten.schlote @ 2015-03-04 11:09 UTC (permalink / raw)
  To: ptxdist; +Cc: Carsten Schlote

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 1/2] bash: Updated the bash shell to release 4.3.30
  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
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2015-03-26  9:11 UTC (permalink / raw)
  To: ptxdist

On Wed, Mar 04, 2015 at 12:09:36PM +0100, carsten.schlote@gmx.net wrote:
> From: Carsten Schlote <schlote@vahanus.net>
> 
> systemd seems to use modern bash features like readarray, which is not
> provided by version 3.2.48 on current ptxdist.
> 
> So I updated the bash package to a more recent bash version.
> 
> The config fragment was updated with actual configure arguments, so that bash
> should be configurable similiar as for 3.2 version.
> 
> Removed unneeded dependency statements and other tweaks like unconditionally
> selecting BASH_CONDITIONAL.
> 
> The patches for version 3.2.48 are dropped as these patches are no longer
> needed for version 4.3. At least I got told so.
> 
> Signed-off-by: Carsten Schlote <schlote@vahanus.net>

Thanks applied, with some changes: I removed to old upstream patches and
added the new upstream patches. And I've marked BASH_SEP_HELPFILES as
broken. There are some cross-compile issues there. If you need it, then it
shouldn't be too hard to fix.

Michael

> ---
>  rules/bash.in   | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
>  rules/bash.make | 29 ++++++++++++++++++-----
>  2 files changed, 88 insertions(+), 12 deletions(-)
> 
> diff --git a/rules/bash.in b/rules/bash.in
> index 8295ad5..beb35c5 100644
> --- a/rules/bash.in
> +++ b/rules/bash.in
> @@ -4,8 +4,6 @@ menuconfig BASH
>  	select LIBC_DL
>  	select GCCLIBS_GCC_S
>  	select NCURSES if BASH_CURSES
> -	# disabling this is currently broken
> -	select BASH_CONDITIONAL
>  	help
>  	  The GNU Bourne Again SHell
>  	  Bash is an sh-compatible command language interpreter that executes
> @@ -47,7 +45,6 @@ config BASH_ALIASES
>  config BASH_ARITHMETIC_FOR
>  	bool
>  	prompt "Enable arithmetic for command"
> -	depends on BASH
>  	help
>  	  Include support for the alternate form of the for command that
>  	  behaves like the C language for statement.
> @@ -76,11 +73,40 @@ config BASH_BRACE
>  	  to pathname expansion, but the filenames generated
>  	  need not exist.
>  
> +config BASH_CASEMODATTR
> +	bool
> +	prompt "include case-modifying variable attributes"
> +
> +config BASH_CASEMODEXP
> +	bool
> +	prompt "include case-modifying word expansions"
> +
> +config BASH_CMDTIMING
> +	bool
> +	prompt "enable the time reserved word and command timing"
> +
>  config BASH_CONDITIONAL
>  	bool
>  	default y
>  	prompt "Enable the conditional command"
> -	depends on BASH
> +
> +config BASH_CONDITIONAL_REGEX
> +	bool
> +	prompt "enable extended regular expression matching in conditional commands"
> +	depends on BASH_CONDITIONAL
> +
> +config BASH_COPROCESSES
> +	bool
> +	default y
> +	prompt "enable coprocess support and the coproc reserved word"
> +
> +config BASH_DEBUGGER
> +	bool
> +	prompt "enable support for bash debugger"
> +
> +config BASH_DIREXPDEFLT
> +	bool
> +	prompt "enable the direxpand shell option by default"
>  
>  config BASH_DIRSTACK
>  	bool
> @@ -94,11 +120,29 @@ config BASH_DIRSTACK
>  	   added to the list with the pushd command;
>  	   the popd command removes entries from the list.
>  
> +config BASH_DISABLED_BUILDINS
> +	bool
> +	prompt "Allow disabled builtins to still be invoked"
> +
> +config BASH_DPARAN_ARITH
> +	bool
> +	prompt "include ((...)) command"
> +	default y
> +
>  config BASH_EXTPATTERN
>  	bool
> -#	default y
>  	prompt "Include ksh-style extended pattern matching"
> -	depends on BASH
> +
> +config BASH_EXTPATTERN_DEFLT
> +	bool
> +	prompt "force extended pattern matching to be enabled by default"
> +
> +config BASH_GLOB_ASCIIRANGE_DEFLT
> +	bool
> +	prompt "bracket range pattern matching uses C locale"
> +	help
> +	  force bracket range expressions in pattern matching to use the C
> +	  locale by default
>  
>  config BASH_HELP
>  	bool
> @@ -124,6 +168,13 @@ config BASH_JOBS
>  	  This enables support for background jobs in bash.
>  	  You can list the actual managed jobs by the "jobs" command.
>  
> +config BASH_MULTIBYTE
> +	bool
> +	prompt "Enable multibyte characters"
> +	default y
> +	help
> +	  Enable multibyte characters if OS supports them.
> +
>  config BASH_PROCSUBST
>  	bool
>  	prompt "Enable process substitution"
> @@ -179,6 +230,14 @@ config BASH_SELECT
>  	  Include the select builtin, which allows the generation of
>  	  simple menus.
>  
> +config BASH_SEP_HELPFILES
> +	bool
> +	prompt "use external files for help builtin documentation"
> +
> +config BASH_SINGLE_HELPLINE
> +	bool
> +	prompt "store help documentation as a single string to ease translation"
> +
>  endif
>  
>  config BASH_GPROF
> diff --git a/rules/bash.make b/rules/bash.make
> index 18d59ea..238eb75 100644
> --- a/rules/bash.make
> +++ b/rules/bash.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BASH) += bash
>  #
>  # Paths and names
>  #
> -BASH_VERSION	:= 3.2.48
> -BASH_MD5	:= 338dcf975a93640bb3eaa843ca42e3f8
> +BASH_VERSION	:= 4.3.30
> +BASH_MD5	:= a27b3ee9be83bd3ba448c0ff52b28447
>  BASH		:= bash-$(BASH_VERSION)
>  BASH_SUFFIX	:= tar.gz
>  BASH_URL	:= $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX))
> @@ -37,28 +37,45 @@ BASH_AUTOCONF	:= \
>  	$(CROSS_AUTOCONF_ROOT) \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--without-bash-malloc \
> -	--disable-net-redirections \
>  	--$(call ptx/endis, PTXCONF_BASH_SHLIKE)-minimal-config \
>  	--$(call ptx/endis, PTXCONF_BASH_ALIASES)-alias \
>  	--$(call ptx/endis, PTXCONF_BASH_ARITHMETIC_FOR)-arith-for-command \
>  	--$(call ptx/endis, PTXCONF_BASH_ARRAY)-array-variables \
>  	--$(call ptx/endis, PTXCONF_BASH_HISTORY)-bang-history \
>  	--$(call ptx/endis, PTXCONF_BASH_BRACE)-brace-expansion \
> +	--$(call ptx/endis, PTXCONF_BASH_CASEMODATTR)-casemod-attributes \
> +	--$(call ptx/endis, PTXCONF_BASH_CASEMODEXP)-casemod-expansions \
> +	--$(call ptx/endis, PTXCONF_BASH_CMDTIMING)-command-timing \
>  	--$(call ptx/endis, PTXCONF_BASH_CONDITIONAL)-cond-command \
> +	--$(call ptx/endis, PTXCONF_BASH_CONDITIONAL_REGEX)-cond-regexp \
> +	--$(call ptx/endis, PTXCONF_BASH_COPROCESSES)-coprocesses \
> +	--$(call ptx/endis, PTXCONF_BASH_DEBUGGER)-debugger \
> +	--$(call ptx/endis, PTXCONF_BASH_DIREXPDEFLT)-direxpand-default \
>  	--$(call ptx/endis, PTXCONF_BASH_DIRSTACK)-directory-stack \
> +	--$(call ptx/endis, PTXCONF_BASH_DISABLED_BUILDINS)-disabled-builtins \
> +	--$(call ptx/endis, PTXCONF_BASH_DPARAN_ARITH)-dparen-arithmetic \
>  	--$(call ptx/endis, PTXCONF_BASH_EXTPATTERN)-extended-glob \
> +	--$(call ptx/endis, PTXCONF_BASH_EXTPATTERN_DEFLT)-extended-glob-default \
> +	--$(call ptx/endis, PTXCONF_BASH_GLOB_ASCIIRANGE_DEFLT)-glob-asciiranges-default \
>  	--$(call ptx/endis, PTXCONF_BASH_HELP)-help-builtin \
>  	--$(call ptx/endis, PTXCONF_BASH_CMDHISTORY)-history \
>  	--$(call ptx/endis, PTXCONF_BASH_JOBS)-job-control \
> +	--$(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_ESC)-prompt-string-decoding \
>  	--$(call ptx/endis, PTXCONF_BASH_EDIT)-readline \
>  	--$(call ptx/endis, PTXCONF_BASH_RESTRICTED)-restricted \
>  	--$(call ptx/endis, PTXCONF_BASH_SELECT)-select \
> -	--$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \
> -	--$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link \
> -	--$(call ptx/endis, PTXCONF_BASH_CURSES)-curses
> +	--$(call ptx/endis, PTXCONF_BASH_SEP_HELPFILES)-separate-helpfiles \
> +	--$(call ptx/endis, PTXCONF_BASH_SINGLE_HELPLINE)-single-help-strings \
> + 	--$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \
> +	--$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link
> +
> +ifdef PTXCONF_BASH_CURSES
> +BASH_AUTOCONF += --with-curses
> +endif
>  
>  ifdef PTXCONF_BASH_JOBS
>  BASH_ENV	+= bash_cv_job_control_missing=present
> -- 
> 2.3.1
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package
  2015-03-04 11:09 ` [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package carsten.schlote
@ 2015-03-26  9:12   ` Michael Olbrich
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2015-03-26  9:12 UTC (permalink / raw)
  To: ptxdist

On Wed, Mar 04, 2015 at 12:09:37PM +0100, carsten.schlote@gmx.net wrote:
> 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.

Thanks, applied with an added migrate helper.

Michael

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

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-03-26  9:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package carsten.schlote
2015-03-26  9:12   ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox