mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] bash: add creation of /usr/bin/sh link
@ 2018-02-07 22:13 Andreas Schmidt
  2018-02-08  9:25 ` Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schmidt @ 2018-02-07 22:13 UTC (permalink / raw)
  To: ptxdist

If bash is selected, but busybox not, no /usr/bin/sh will create.
This patch add possibility to do this.

Signed-off-by: Andreas Schmidt <mail@schmidt-andreas.de>
---
 rules/bash.in   | 10 ++++++++++
 rules/bash.make |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/rules/bash.in b/rules/bash.in
index b902dfbc7..42f0bb420 100644
--- a/rules/bash.in
+++ b/rules/bash.in
@@ -261,4 +261,14 @@ config BASH_CURSES
 	bool
 	prompt "Use libcurses instead of libtermcap"
 
+if !BUSYBOX && BUSYBOX != m
+
+config BASH_SH
+	bool
+	prompt "sh"
+	help
+	  Choose bash to be the shell executed by 'sh' name.
+
+endif
+
 endif
diff --git a/rules/bash.make b/rules/bash.make
index 39a6b05fd..8228688f9 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -98,6 +98,9 @@ $(STATEDIR)/bash.targetinstall:
 ifdef PTXCONF_BUSYBOX_SH_IS_NONE
 	@$(call install_link, bash, bash, /usr/bin/sh)
 endif
+ifdef PTXCONF_BASH_SH
+	@$(call install_link, bash, bash, /usr/bin/sh)
+endif
 
 	@$(call install_finish, bash)
 
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* Re: [ptxdist] [PATCH] bash: add creation of /usr/bin/sh link
  2018-02-07 22:13 [ptxdist] [PATCH] bash: add creation of /usr/bin/sh link Andreas Schmidt
@ 2018-02-08  9:25 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2018-02-08  9:25 UTC (permalink / raw)
  To: ptxdist

On Wed, Feb 07, 2018 at 11:13:00PM +0100, Andreas Schmidt wrote:
> If bash is selected, but busybox not, no /usr/bin/sh will create.
> This patch add possibility to do this.
> 
> Signed-off-by: Andreas Schmidt <mail@schmidt-andreas.de>
> ---
>  rules/bash.in   | 10 ++++++++++
>  rules/bash.make |  3 +++
>  2 files changed, 13 insertions(+)
> 
> diff --git a/rules/bash.in b/rules/bash.in
> index b902dfbc7..42f0bb420 100644
> --- a/rules/bash.in
> +++ b/rules/bash.in
> @@ -261,4 +261,14 @@ config BASH_CURSES
>  	bool
>  	prompt "Use libcurses instead of libtermcap"
>  
> +if !BUSYBOX && BUSYBOX != m
> +
> +config BASH_SH
> +	bool
> +	prompt "sh"
> +	help
> +	  Choose bash to be the shell executed by 'sh' name.
> +
> +endif

I think we should always provide the 'sh' link

config BASH_SH
	bool
	default BUSYBOX = n || BUSYBOX_SH_IS_NONE

> +
>  endif
> diff --git a/rules/bash.make b/rules/bash.make
> index 39a6b05fd..8228688f9 100644
> --- a/rules/bash.make
> +++ b/rules/bash.make
> @@ -98,6 +98,9 @@ $(STATEDIR)/bash.targetinstall:
>  ifdef PTXCONF_BUSYBOX_SH_IS_NONE
>  	@$(call install_link, bash, bash, /usr/bin/sh)
>  endif

... and then remove this ...

> +ifdef PTXCONF_BASH_SH
> +	@$(call install_link, bash, bash, /usr/bin/sh)
> +endif

... and add this

Michael

>  
>  	@$(call install_finish, bash)
>  
> -- 
> 2.16.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] 2+ messages in thread

end of thread, other threads:[~2018-02-08  9:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-07 22:13 [ptxdist] [PATCH] bash: add creation of /usr/bin/sh link Andreas Schmidt
2018-02-08  9:25 ` Michael Olbrich

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