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

[Emmanuele Bassi <ebassi src gnome org>]

commit 39b8fbfd53e8c2e847409b86ca39a179ec679b78
Author: Amarnath Valluri <amarnath valluri intel com>
Date:   Tue Jun 13 09:52:37 2017 +0300

    busybox: changes to support merged /usr
    
    Most of the shell scripts refer to /bin/sh inside the script. When 'usrmege'
    feature is enabled, this path would be /usr/bin/sh. Hence, to satisfy build
    dependency add '/bin/sh' to it's providers list.
    
    (From OE-Core rev: 1f6c14939c8daa5e09103789c3ff5031cc888d16)
    
    Signed-off-by: Amarnath Valluri <amarnath valluri intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/busybox/busybox.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index b23eaa1..0816df6 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -439,3 +439,5 @@ pkg_prerm_${PN}-syslog () {
                fi
        fi
 }
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}"