summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
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:22 +0100
commit1f6c14939c8daa5e09103789c3ff5031cc888d16 (patch)
tree449dcf1b7be14185d51b404c8108854ba39ef4b5 /meta/recipes-core/busybox
parent4759408677a4e60c5fa7131afcb5bc184cf2f90a (diff)
downloadopenembedded-core-contrib-1f6c14939c8daa5e09103789c3ff5031cc888d16.tar.gz
openembedded-core-contrib-1f6c14939c8daa5e09103789c3ff5031cc888d16.tar.bz2
openembedded-core-contrib-1f6c14939c8daa5e09103789c3ff5031cc888d16.zip
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>
Diffstat (limited to 'meta/recipes-core/busybox')
-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 () {
fi
fi
}
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}"