[meta-oe][PATCH] zsh: work around file-rdeps QA issues with usrmerge in DISTRO_FEATURES


Martin Jansa
 

Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
meta-oe/recipes-shells/zsh/zsh_5.8.bb | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-shells/zsh/zsh_5.8.bb b/meta-oe/recipes-shells/zsh/zsh_5.8.bb
index 6fc5f4d993..f87231db2f 100644
--- a/meta-oe/recipes-shells/zsh/zsh_5.8.bb
+++ b/meta-oe/recipes-shells/zsh/zsh_5.8.bb
@@ -51,3 +51,8 @@ pkg_postinst_${PN} () {
grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells
grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells
}
+
+# work around QA failures with usrmerge installing zsh in /usr/bin/zsh instead of /bin/zsh
+# ERROR: QA Issue: /usr/share/zsh/5.8/functions/zed contained in package zsh requires /bin/zsh, but no providers found in RDEPENDS_zsh? [file-rdeps]
+# like bash does since https://git.openembedded.org/openembedded-core/commit/?id=4759408677a4e60c5fa7131afcb5bc184cf2f90a
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}"
--
2.30.2

Join openembedded-devel@lists.openembedded.org to automatically receive all group messages.