From: Amarnath Valluri <amarnath.valluri@intel.com>
Date: Tue, 13 Jun 2017 06:52:37 +0000 (+0300)
Subject: busybox: changes to support merged /usr
X-Git-Tag: uninative-1.7~480
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1f6c14939c8daa5e09103789c3ff5031cc888d16;p=openembedded-core.git

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.

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index b23eaa1068..0816df624a 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)}"