diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
| commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
| tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-extended/procps | |
| parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
| download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz | |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/procps')
| -rw-r--r-- | meta/recipes-extended/procps/procps_3.3.17.bb | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-extended/procps/procps_3.3.17.bb b/meta/recipes-extended/procps/procps_3.3.17.bb index c74a901d9a..64a2d154b6 100644 --- a/meta/recipes-extended/procps/procps_3.3.17.bb +++ b/meta/recipes-extended/procps/procps_3.3.17.bb | |||
| @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" | |||
| 24 | # Upstream has a custom autogen.sh which invokes po/update-potfiles as they | 24 | # Upstream has a custom autogen.sh which invokes po/update-potfiles as they |
| 25 | # don't ship a po/POTFILES.in (which is silly). Without that file gettext | 25 | # don't ship a po/POTFILES.in (which is silly). Without that file gettext |
| 26 | # doesn't believe po/ is a gettext directory and won't generate po/Makefile. | 26 | # doesn't believe po/ is a gettext directory and won't generate po/Makefile. |
| 27 | do_configure_prepend() { | 27 | do_configure:prepend() { |
| 28 | ( cd ${S} && po/update-potfiles ) | 28 | ( cd ${S} && po/update-potfiles ) |
| 29 | } | 29 | } |
| 30 | 30 | ||
| @@ -33,7 +33,7 @@ EXTRA_OECONF = "--enable-skill --disable-modern-top" | |||
| 33 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 33 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
| 34 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" | 34 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" |
| 35 | 35 | ||
| 36 | do_install_append () { | 36 | do_install:append () { |
| 37 | install -d ${D}${base_bindir} | 37 | install -d ${D}${base_bindir} |
| 38 | [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done | 38 | [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done |
| 39 | install -d ${D}${base_sbindir} | 39 | install -d ${D}${base_sbindir} |
| @@ -50,7 +50,7 @@ do_install_append () { | |||
| 50 | fi | 50 | fi |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" | 53 | CONFFILES:${PN} = "${sysconfdir}/sysctl.conf" |
| 54 | 54 | ||
| 55 | bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w" | 55 | bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w" |
| 56 | base_bindir_progs += "kill pidof ps watch" | 56 | base_bindir_progs += "kill pidof ps watch" |
| @@ -59,9 +59,9 @@ base_sbindir_progs += "sysctl" | |||
| 59 | ALTERNATIVE_PRIORITY = "200" | 59 | ALTERNATIVE_PRIORITY = "200" |
| 60 | ALTERNATIVE_PRIORITY[pidof] = "150" | 60 | ALTERNATIVE_PRIORITY[pidof] = "150" |
| 61 | 61 | ||
| 62 | ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" | 62 | ALTERNATIVE:${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" |
| 63 | 63 | ||
| 64 | ALTERNATIVE_${PN}-doc = "kill.1 uptime.1" | 64 | ALTERNATIVE:${PN}-doc = "kill.1 uptime.1" |
| 65 | ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" | 65 | ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" |
| 66 | ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" | 66 | ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" |
| 67 | 67 | ||
| @@ -82,22 +82,22 @@ PROCPS_PACKAGES = "${PN}-lib \ | |||
| 82 | ${PN}-sysctl" | 82 | ${PN}-sysctl" |
| 83 | 83 | ||
| 84 | PACKAGE_BEFORE_PN = "${PROCPS_PACKAGES}" | 84 | PACKAGE_BEFORE_PN = "${PROCPS_PACKAGES}" |
| 85 | RDEPENDS_${PN} += "${PROCPS_PACKAGES}" | 85 | RDEPENDS:${PN} += "${PROCPS_PACKAGES}" |
| 86 | 86 | ||
| 87 | RDEPENDS_${PN}-ps += "${PN}-lib" | 87 | RDEPENDS:${PN}-ps += "${PN}-lib" |
| 88 | RDEPENDS_${PN}-sysctl += "${PN}-lib" | 88 | RDEPENDS:${PN}-sysctl += "${PN}-lib" |
| 89 | 89 | ||
| 90 | FILES_${PN}-lib = "${libdir}" | 90 | FILES:${PN}-lib = "${libdir}" |
| 91 | FILES_${PN}-ps = "${base_bindir}/ps.${BPN}" | 91 | FILES:${PN}-ps = "${base_bindir}/ps.${BPN}" |
| 92 | FILES_${PN}-sysctl = "${base_sbindir}/sysctl.${BPN} ${sysconfdir}/sysctl.conf ${sysconfdir}/sysctl.d" | 92 | FILES:${PN}-sysctl = "${base_sbindir}/sysctl.${BPN} ${sysconfdir}/sysctl.conf ${sysconfdir}/sysctl.d" |
| 93 | 93 | ||
| 94 | ALTERNATIVE_${PN}_remove = "ps" | 94 | ALTERNATIVE:${PN}:remove = "ps" |
| 95 | ALTERNATIVE_${PN}_remove = "sysctl" | 95 | ALTERNATIVE:${PN}:remove = "sysctl" |
| 96 | 96 | ||
| 97 | ALTERNATIVE_${PN}-ps = "ps" | 97 | ALTERNATIVE:${PN}-ps = "ps" |
| 98 | ALTERNATIVE_TARGET[ps] = "${base_bindir}/ps" | 98 | ALTERNATIVE_TARGET[ps] = "${base_bindir}/ps" |
| 99 | ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" | 99 | ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" |
| 100 | 100 | ||
| 101 | ALTERNATIVE_${PN}-sysctl = "sysctl" | 101 | ALTERNATIVE:${PN}-sysctl = "sysctl" |
| 102 | ALTERNATIVE_TARGET[sysctl] = "${base_sbindir}/sysctl" | 102 | ALTERNATIVE_TARGET[sysctl] = "${base_sbindir}/sysctl" |
| 103 | ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl" \ No newline at end of file | 103 | ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl" \ No newline at end of file |
