summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-shells
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-shells')
-rw-r--r--meta-oe/recipes-shells/dash/dash_0.5.11.3.bb6
-rw-r--r--meta-oe/recipes-shells/mksh/mksh_59.bb4
-rw-r--r--meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb8
-rw-r--r--meta-oe/recipes-shells/zsh/zsh_5.8.bb8
4 files changed, 13 insertions, 13 deletions
diff --git a/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb b/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb
index 92d9bc83d..53d018358 100644
--- a/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb
+++ b/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb
@@ -13,15 +13,15 @@ SRC_URI[sha256sum] = "62b9f1676ba6a7e8eaec541a39ea037b325253240d1f378c72360baa1c
13 13
14EXTRA_OECONF += "--bindir=${base_bindir}" 14EXTRA_OECONF += "--bindir=${base_bindir}"
15 15
16ALTERNATIVE_${PN} = "sh" 16ALTERNATIVE:${PN} = "sh"
17ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" 17ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
18ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" 18ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash"
19ALTERNATIVE_PRIORITY = "10" 19ALTERNATIVE_PRIORITY = "10"
20 20
21pkg_postinst_${PN} () { 21pkg_postinst:${PN} () {
22 grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells 22 grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells
23} 23}
24 24
25pkg_postrm_${PN} () { 25pkg_postrm:${PN} () {
26 printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells 26 printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells
27} 27}
diff --git a/meta-oe/recipes-shells/mksh/mksh_59.bb b/meta-oe/recipes-shells/mksh/mksh_59.bb
index 110e793b0..9cd0fbc25 100644
--- a/meta-oe/recipes-shells/mksh/mksh_59.bb
+++ b/meta-oe/recipes-shells/mksh/mksh_59.bb
@@ -16,7 +16,7 @@ inherit update-alternatives
16 16
17S = "${WORKDIR}/${BPN}" 17S = "${WORKDIR}/${BPN}"
18 18
19ALTERNATIVE_${PN} = "sh" 19ALTERNATIVE:${PN} = "sh"
20ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" 20ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
21ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" 21ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}"
22ALTERNATIVE_PRIORITY = "100" 22ALTERNATIVE_PRIORITY = "100"
@@ -33,4 +33,4 @@ do_install() {
33 install -m 0644 ${S}/dot.mkshrc ${D}${sysconfdir}/skel/.mkshrc 33 install -m 0644 ${S}/dot.mkshrc ${D}${sysconfdir}/skel/.mkshrc
34} 34}
35 35
36RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}" 36RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}"
diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb
index f74f582e3..ac6c6db81 100644
--- a/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb
+++ b/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb
@@ -19,11 +19,11 @@ SRC_URI[sha256sum] = "eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b1513
19EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" 19EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'"
20inherit autotools 20inherit autotools
21 21
22do_compile_prepend() { 22do_compile:prepend() {
23 oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' gethost 23 oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' gethost
24} 24}
25 25
26do_install_append () { 26do_install:append () {
27 oe_runmake install.man DESTDIR=${D} 27 oe_runmake install.man DESTDIR=${D}
28 28
29 install -d ${D}${base_bindir} 29 install -d ${D}${base_bindir}
@@ -34,10 +34,10 @@ do_install_append () {
34 install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el 34 install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el
35} 35}
36 36
37FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" 37FILES:${PN} += "${datadir}/emacs/site-lisp/csh-mode.el"
38 38
39 39
40pkg_postinst_${PN} () { 40pkg_postinst:${PN} () {
41#!/bin/sh -e 41#!/bin/sh -e
42echo /usr/bin/tcsh >> $D/etc/shells 42echo /usr/bin/tcsh >> $D/etc/shells
43echo /usr/bin/csh >> $D/etc/shells 43echo /usr/bin/csh >> $D/etc/shells
diff --git a/meta-oe/recipes-shells/zsh/zsh_5.8.bb b/meta-oe/recipes-shells/zsh/zsh_5.8.bb
index f87231db2..0429cb9cc 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)}"