diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-05-24 19:59:48 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-05-28 06:55:33 -0700 |
| commit | b25ea9cb97a7afbffdf4ed01c195ab602213ed18 (patch) | |
| tree | d597a449409947ea63b9949582e0257712e67ed8 | |
| parent | b3742bef0643600b39a1f8214d8fe3ac7d4e70f7 (diff) | |
| download | meta-openembedded-b25ea9cb97a7afbffdf4ed01c195ab602213ed18.tar.gz | |
zsh: work around file-rdeps QA issues with usrmerge in DISTRO_FEATURES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-shells/zsh/zsh_5.8.bb | 5 |
1 files changed, 5 insertions, 0 deletions
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} () { | |||
| 51 | grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells | 51 | grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells |
| 52 | grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells | 52 | grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells |
| 53 | } | 53 | } |
| 54 | |||
| 55 | # work around QA failures with usrmerge installing zsh in /usr/bin/zsh instead of /bin/zsh | ||
| 56 | # 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] | ||
| 57 | # like bash does since https://git.openembedded.org/openembedded-core/commit/?id=4759408677a4e60c5fa7131afcb5bc184cf2f90a | ||
| 58 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}" | ||