[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6315/8267] bash: changes to support merged /usr

[Emmanuele Bassi <ebassi src gnome org>]

commit 591d4e8aea88fea4d25b6d2d1bd87a015d8205a6
Author: Amarnath Valluri <amarnath valluri intel com>
Date:   Tue Jun 13 09:52:36 2017 +0300

    bash: changes to support merged /usr
    
    Most of shell scripts refer to '#!/bin/{sh,bash}' inside the script. But when
    'usrmege' feature is enabled this path will be /usr/bin/{sh, bash}.
    
    so to satisify build dependency add '/bin/{sh,bash}' to its providers list.
    
    (From OE-Core rev: 4759408677a4e60c5fa7131afcb5bc184cf2f90a)
    
    Signed-off-by: Amarnath Valluri <amarnath valluri intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-extended/bash/bash.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 3e9c662..6c94a24 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -69,3 +69,5 @@ pkg_postrm_${PN} () {
 PACKAGES += "${PN}-bashbug"
 FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash"
 FILES_${PN}-bashbug = "${bindir}/bashbug"
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}"