aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-04-21 03:30:36 +0200
committerRoss Burton <ross.burton@intel.com>2018-04-23 11:18:37 +0100
commit556d2f2446c45c23dcaf1ccd610b88af8b4ba44c (patch)
treef7cad0c1d0024c96a55e7d78a91606610a127949
parentacc8286d36f0efa3089a5a33ac1c155f75698534 (diff)
downloadmeta-gplv2-556d2f2446c45c23dcaf1ccd610b88af8b4ba44c.tar.gz
meta-gplv2-556d2f2446c45c23dcaf1ccd610b88af8b4ba44c.tar.bz2
meta-gplv2-556d2f2446c45c23dcaf1ccd610b88af8b4ba44c.zip
bash: Provide /bin/{sh, bash} when usrmerge is used
Most shell scripts have '#!/bin/{sh,bash}' on the first line of the script, which triggers RPM to automatically add a runtime dependency on that path for any package that contains shell scripts. However, when the usrmerge feature is enabled, the path will actually be /usr/bin/{sh,bash}. So, to satisfy the runtime dependencies, add '/bin/{sh,bash}' to what the bash package provides. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--recipes-extended/bash/bash.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-extended/bash/bash.inc b/recipes-extended/bash/bash.inc
index a05b987..0f0d679 100644
--- a/recipes-extended/bash/bash.inc
+++ b/recipes-extended/bash/bash.inc
@@ -65,3 +65,5 @@ pkg_postinst_${PN} () {
pkg_postrm_${PN} () {
printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells
}
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}"