From 556d2f2446c45c23dcaf1ccd610b88af8b4ba44c Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 21 Apr 2018 03:30:36 +0200 Subject: 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 Signed-off-by: Ross Burton --- recipes-extended/bash/bash.inc | 2 ++ 1 file changed, 2 insertions(+) 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)}" -- cgit v1.2.3-54-g00ecf