diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-29 23:59:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 00:02:10 +0100 |
commit | 80747190ccce6628ce8815cf856f6ab867a00b5d (patch) | |
tree | 07be151fe85a5cf4207b8606fbe566e339e105e5 /recipes-extended/bash | |
parent | 27eafbb395fd4f607249b2e57085012e40283926 (diff) | |
download | meta-gplv2-80747190ccce6628ce8815cf856f6ab867a00b5d.tar.gz |
meta-gplv2: Convert to new override syntax
This converts the layer to the new override syntax. This was done using
<oe-core>/scripts/contrib/convert-overrides.py <this-layer>
with no manual fixes.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'recipes-extended/bash')
-rw-r--r-- | recipes-extended/bash/bash.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/recipes-extended/bash/bash.inc b/recipes-extended/bash/bash.inc index 0f0d679..4767618 100644 --- a/recipes-extended/bash/bash.inc +++ b/recipes-extended/bash/bash.inc | |||
@@ -14,21 +14,21 @@ EXTRA_OECONF = "--enable-job-control --without-bash-malloc" | |||
14 | # This is what other major distros do. And this is what we wanted. See bug#5359 and bug#7137. | 14 | # This is what other major distros do. And this is what we wanted. See bug#5359 and bug#7137. |
15 | CFLAGS += "-DNON_INTERACTIVE_LOGIN_SHELLS" | 15 | CFLAGS += "-DNON_INTERACTIVE_LOGIN_SHELLS" |
16 | 16 | ||
17 | ALTERNATIVE_${PN} = "bash sh" | 17 | ALTERNATIVE:${PN} = "bash sh" |
18 | ALTERNATIVE_LINK_NAME[bash] = "${base_bindir}/bash" | 18 | ALTERNATIVE_LINK_NAME[bash] = "${base_bindir}/bash" |
19 | ALTERNATIVE_TARGET[bash] = "${base_bindir}/bash" | 19 | ALTERNATIVE_TARGET[bash] = "${base_bindir}/bash" |
20 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" | 20 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" |
21 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/bash.${BPN}" | 21 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/bash.${BPN}" |
22 | ALTERNATIVE_PRIORITY = "100" | 22 | ALTERNATIVE_PRIORITY = "100" |
23 | 23 | ||
24 | RDEPENDS_${PN} += "base-files" | 24 | RDEPENDS:${PN} += "base-files" |
25 | RDEPENDS_${PN}_class-nativesdk = "" | 25 | RDEPENDS:${PN}:class-nativesdk = "" |
26 | RDEPENDS_${PN}-ptest += "make" | 26 | RDEPENDS:${PN}-ptest += "make" |
27 | 27 | ||
28 | USERADD_PACKAGES = "${PN}-ptest" | 28 | USERADD_PACKAGES = "${PN}-ptest" |
29 | USERADD_PARAM_${PN}-ptest = "--create-home --user-group test" | 29 | USERADD_PARAM:${PN}-ptest = "--create-home --user-group test" |
30 | 30 | ||
31 | do_configure_prepend () { | 31 | do_configure:prepend () { |
32 | if [ ! -e ${S}/acinclude.m4 ]; then | 32 | if [ ! -e ${S}/acinclude.m4 ]; then |
33 | cat ${S}/aclocal.m4 > ${S}/acinclude.m4 | 33 | cat ${S}/aclocal.m4 > ${S}/acinclude.m4 |
34 | fi | 34 | fi |
@@ -38,14 +38,14 @@ do_compile_ptest () { | |||
38 | oe_runmake buildtest | 38 | oe_runmake buildtest |
39 | } | 39 | } |
40 | 40 | ||
41 | do_install_append () { | 41 | do_install:append () { |
42 | # Move /usr/bin/bash to /bin/bash, if need | 42 | # Move /usr/bin/bash to /bin/bash, if need |
43 | if [ "${base_bindir}" != "${bindir}" ]; then | 43 | if [ "${base_bindir}" != "${bindir}" ]; then |
44 | mkdir -p ${D}${base_bindir} | 44 | mkdir -p ${D}${base_bindir} |
45 | mv ${D}${bindir}/bash ${D}${base_bindir} | 45 | mv ${D}${bindir}/bash ${D}${base_bindir} |
46 | fi | 46 | fi |
47 | } | 47 | } |
48 | do_install_append_class-target () { | 48 | do_install:append:class-target () { |
49 | # Clean host path in bashbug | 49 | # Clean host path in bashbug |
50 | sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ | 50 | sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ |
51 | -e "s,-I${WORKDIR}/\S* ,,g" ${D}${bindir}/bashbug | 51 | -e "s,-I${WORKDIR}/\S* ,,g" ${D}${bindir}/bashbug |
@@ -58,12 +58,12 @@ do_install_ptest () { | |||
58 | -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" ${D}${PTEST_PATH}/Makefile | 58 | -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" ${D}${PTEST_PATH}/Makefile |
59 | } | 59 | } |
60 | 60 | ||
61 | pkg_postinst_${PN} () { | 61 | pkg_postinst:${PN} () { |
62 | grep -q "^${base_bindir}/bash$" $D${sysconfdir}/shells || echo ${base_bindir}/bash >> $D${sysconfdir}/shells | 62 | grep -q "^${base_bindir}/bash$" $D${sysconfdir}/shells || echo ${base_bindir}/bash >> $D${sysconfdir}/shells |
63 | } | 63 | } |
64 | 64 | ||
65 | pkg_postrm_${PN} () { | 65 | pkg_postrm:${PN} () { |
66 | printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells | 66 | printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells |
67 | } | 67 | } |
68 | 68 | ||
69 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" | 69 | RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" |