diff options
Diffstat (limited to 'meta-oe/recipes-shells')
-rw-r--r-- | meta-oe/recipes-shells/dash/dash_0.5.11.3.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-shells/mksh/mksh_59.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-shells/zsh/zsh_5.8.bb | 8 |
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 | ||
14 | EXTRA_OECONF += "--bindir=${base_bindir}" | 14 | EXTRA_OECONF += "--bindir=${base_bindir}" |
15 | 15 | ||
16 | ALTERNATIVE_${PN} = "sh" | 16 | ALTERNATIVE:${PN} = "sh" |
17 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" | 17 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" |
18 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" | 18 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" |
19 | ALTERNATIVE_PRIORITY = "10" | 19 | ALTERNATIVE_PRIORITY = "10" |
20 | 20 | ||
21 | pkg_postinst_${PN} () { | 21 | pkg_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 | ||
25 | pkg_postrm_${PN} () { | 25 | pkg_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 | ||
17 | S = "${WORKDIR}/${BPN}" | 17 | S = "${WORKDIR}/${BPN}" |
18 | 18 | ||
19 | ALTERNATIVE_${PN} = "sh" | 19 | ALTERNATIVE:${PN} = "sh" |
20 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" | 20 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" |
21 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" | 21 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" |
22 | ALTERNATIVE_PRIORITY = "100" | 22 | ALTERNATIVE_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 | ||
36 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}" | 36 | RPROVIDES:${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 | |||
19 | EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" | 19 | EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" |
20 | inherit autotools | 20 | inherit autotools |
21 | 21 | ||
22 | do_compile_prepend() { | 22 | do_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 | ||
26 | do_install_append () { | 26 | do_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 | ||
37 | FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" | 37 | FILES:${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" |
38 | 38 | ||
39 | 39 | ||
40 | pkg_postinst_${PN} () { | 40 | pkg_postinst:${PN} () { |
41 | #!/bin/sh -e | 41 | #!/bin/sh -e |
42 | echo /usr/bin/tcsh >> $D/etc/shells | 42 | echo /usr/bin/tcsh >> $D/etc/shells |
43 | echo /usr/bin/csh >> $D/etc/shells | 43 | echo /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 | ||
35 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | 35 | EXTRA_OEMAKE = "-e MAKEFLAGS=" |
36 | 36 | ||
37 | ALTERNATIVE_${PN} = "sh" | 37 | ALTERNATIVE:${PN} = "sh" |
38 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" | 38 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" |
39 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" | 39 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" |
40 | ALTERNATIVE_PRIORITY = "90" | 40 | ALTERNATIVE_PRIORITY = "90" |
@@ -46,13 +46,13 @@ do_configure () { | |||
46 | oe_runconf | 46 | oe_runconf |
47 | } | 47 | } |
48 | 48 | ||
49 | pkg_postinst_${PN} () { | 49 | pkg_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 |
58 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}" | 58 | RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}" |