summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-shells/zsh
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-07-29 17:04:53 +0200
committerKhem Raj <raj.khem@gmail.com>2021-08-03 10:21:25 -0700
commitc61dc077bbd81260e4f167fa2251643ba0ba6974 (patch)
tree66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-shells/zsh
parentc5f7cfb8db54cfa4257797db5bd87828dea43296 (diff)
downloadmeta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz
Convert to new override syntax
This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-shells/zsh')
-rw-r--r--meta-oe/recipes-shells/zsh/zsh_5.8.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-shells/zsh/zsh_5.8.bb b/meta-oe/recipes-shells/zsh/zsh_5.8.bb
index f87231db2f..0429cb9cc7 100644
--- a/meta-oe/recipes-shells/zsh/zsh_5.8.bb
+++ b/meta-oe/recipes-shells/zsh/zsh_5.8.bb
@@ -34,7 +34,7 @@ export bindir="${base_bindir}"
34 34
35EXTRA_OEMAKE = "-e MAKEFLAGS=" 35EXTRA_OEMAKE = "-e MAKEFLAGS="
36 36
37ALTERNATIVE_${PN} = "sh" 37ALTERNATIVE:${PN} = "sh"
38ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" 38ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
39ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" 39ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}"
40ALTERNATIVE_PRIORITY = "90" 40ALTERNATIVE_PRIORITY = "90"
@@ -46,13 +46,13 @@ do_configure () {
46 oe_runconf 46 oe_runconf
47} 47}
48 48
49pkg_postinst_${PN} () { 49pkg_postinst:${PN} () {
50 touch $D${sysconfdir}/shells 50 touch $D${sysconfdir}/shells
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 54
55# work around QA failures with usrmerge installing zsh in /usr/bin/zsh instead of /bin/zsh 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] 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 57# like bash does since https://git.openembedded.org/openembedded-core/commit/?id=4759408677a4e60c5fa7131afcb5bc184cf2f90a
58RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}" 58RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}"