diff options
author | Amarnath Valluri <amarnath.valluri@intel.com> | 2017-06-13 09:52:36 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-14 10:18:30 +0100 |
commit | 591d4e8aea88fea4d25b6d2d1bd87a015d8205a6 (patch) | |
tree | 5b84b2f35d713d50e09b08d9f1644554c18e2774 /meta/recipes-extended/bash | |
parent | 6e43be47d0eca11a8e6c03e517f57845cb2b80cc (diff) | |
download | poky-591d4e8aea88fea4d25b6d2d1bd87a015d8205a6.tar.gz |
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.
(From OE-Core rev: 4759408677a4e60c5fa7131afcb5bc184cf2f90a)
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/bash')
-rw-r--r-- | meta/recipes-extended/bash/bash.inc | 2 |
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} () { | |||
69 | PACKAGES += "${PN}-bashbug" | 69 | PACKAGES += "${PN}-bashbug" |
70 | FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash" | 70 | FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash" |
71 | FILES_${PN}-bashbug = "${bindir}/bashbug" | 71 | FILES_${PN}-bashbug = "${bindir}/bashbug" |
72 | |||
73 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" | ||