diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-shells')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb (renamed from meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb) | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb index aa372b70a..f87231db2 100644 --- a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=1a4c4cda3e8096d2fd483ff2f4514fec" DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "dfe156fd69b0d8d1745ecf6d6e02e047" -SRC_URI[sha256sum] = "957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/5.8/${BP}.tar.xz" +SRC_URI[sha256sum] = "dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27" -inherit autotools gettext update-alternatives +inherit autotools-brokensep gettext update-alternatives manpages EXTRA_OECONF = " \ --bindir=${base_bindir} \ @@ -47,19 +46,13 @@ do_configure () { oe_runconf } -do_install_append () { - rm -fr ${D}/usr/share - rmdir --ignore-fail-on-non-empty ${D}/usr -} - pkg_postinst_${PN} () { touch $D${sysconfdir}/shells 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 } -FILES_${PN}-dbg += "\ - ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \ - ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \ - ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \ -" +# 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)}" |