[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4519/8267] bash: use update-alternatives for the bash binary

[Emmanuele Bassi <ebassi src gnome org>]

commit 0b040f9534ea7530112709eacd299f7313eef380
Author: Andreas Oberritter <obi opendreambox org>
Date:   Wed Nov 30 19:50:26 2016 +0100

    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>

 meta/recipes-extended/bash/bash.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 1d08526..a05b987 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"