From 4759408677a4e60c5fa7131afcb5bc184cf2f90a Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Tue, 13 Jun 2017 09:52:36 +0300 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta') 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)}" -- cgit 1.2.3-korg