summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-06-13 09:52:37 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:18:30 +0100
commit39b8fbfd53e8c2e847409b86ca39a179ec679b78 (patch)
tree085dd7ea3ee1b0db43b73f9964358ea8170093eb
parent591d4e8aea88fea4d25b6d2d1bd87a015d8205a6 (diff)
downloadpoky-39b8fbfd53e8c2e847409b86ca39a179ec679b78.tar.gz
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>
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
1 files changed, 2 insertions, 0 deletions
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 () {
439 fi 439 fi
440 fi 440 fi
441} 441}
442
443RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}"