summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-06-13 09:52:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:18:22 +0100
commit4759408677a4e60c5fa7131afcb5bc184cf2f90a (patch)
tree1c901a064e77a3c530d443464ec8c781e04d70d1
parent12abcc3791592035d99064262eb3d229fa5ef88c (diff)
downloadopenembedded-core-contrib-4759408677a4e60c5fa7131afcb5bc184cf2f90a.tar.gz
openembedded-core-contrib-4759408677a4e60c5fa7131afcb5bc184cf2f90a.tar.bz2
openembedded-core-contrib-4759408677a4e60c5fa7131afcb5bc184cf2f90a.zip
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@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bash/bash.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 3e9c662569..6c94a24b69 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)}"