aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-11-30 19:50:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:22:18 +0000
commit0b040f9534ea7530112709eacd299f7313eef380 (patch)
treeddc5fd61760d827eea7747f119d33f44a1b508a2
parent07f32d7af8959901914e0af561a2285c1b5df207 (diff)
downloadopenembedded-core-contrib-0b040f9534ea7530112709eacd299f7313eef380.tar.gz
openembedded-core-contrib-0b040f9534ea7530112709eacd299f7313eef380.tar.bz2
openembedded-core-contrib-0b040f9534ea7530112709eacd299f7313eef380.zip
bash: use update-alternatives for the bash binary
Busybox may offer a bash applet. If enabled, the alternatives mechanism avoids breaking logins if bash gets deinstalled while /bin/bash is configured as a login shell. (From OE-Core rev: cf0fd8bff79a12b6eec45145ef168ebf5afebdcc) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bash/bash.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 1d08526c9e7..a05b987b87b 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -14,9 +14,11 @@ EXTRA_OECONF = "--enable-job-control --without-bash-malloc"
# This is what other major distros do. And this is what we wanted. See bug#5359 and bug#7137.
CFLAGS += "-DNON_INTERACTIVE_LOGIN_SHELLS"
-ALTERNATIVE_${PN} = "sh"
+ALTERNATIVE_${PN} = "bash sh"
+ALTERNATIVE_LINK_NAME[bash] = "${base_bindir}/bash"
+ALTERNATIVE_TARGET[bash] = "${base_bindir}/bash"
ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
-ALTERNATIVE_TARGET[sh] = "${base_bindir}/bash"
+ALTERNATIVE_TARGET[sh] = "${base_bindir}/bash.${BPN}"
ALTERNATIVE_PRIORITY = "100"
RDEPENDS_${PN} += "base-files"