[oe-commits] [openembedded-core] 32/37: bash: changes to support merged /usr

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 75cb8cffd272cf14f83708c6448346f8d25fff3d
Author: Amarnath Valluri <amarnath.valluri at intel.com>
AuthorDate: 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.
    
    Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/bash/bash.inc | 2 ++
 1 file changed, 2 insertions(+)

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)}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.