diff options
Diffstat (limited to 'meta/recipes-extended/procps')
-rw-r--r-- | meta/recipes-extended/procps/procps_4.0.4.bb (renamed from meta/recipes-extended/procps/procps_3.3.16.bb) | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/meta/recipes-extended/procps/procps_3.3.16.bb b/meta/recipes-extended/procps/procps_4.0.4.bb index ef3ac86e97..800384f22f 100644 --- a/meta/recipes-extended/procps/procps_3.3.16.bb +++ b/meta/recipes-extended/procps/procps_4.0.4.bb | |||
@@ -3,7 +3,7 @@ DESCRIPTION = "Procps contains a set of system utilities that provide system inf | |||
3 | the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, and skill." | 3 | the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, and skill." |
4 | HOMEPAGE = "https://gitlab.com/procps-ng/procps" | 4 | HOMEPAGE = "https://gitlab.com/procps-ng/procps" |
5 | SECTION = "base" | 5 | SECTION = "base" |
6 | LICENSE = "GPLv2+ & LGPLv2+" | 6 | LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
8 | file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db \ | 8 | file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db \ |
9 | " | 9 | " |
@@ -12,17 +12,17 @@ DEPENDS = "ncurses" | |||
12 | 12 | ||
13 | inherit autotools gettext pkgconfig update-alternatives | 13 | inherit autotools gettext pkgconfig update-alternatives |
14 | 14 | ||
15 | SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \ | 15 | SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ |
16 | file://sysctl.conf \ | 16 | file://sysctl.conf \ |
17 | " | 17 | " |
18 | SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" | 18 | SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" |
19 | 19 | ||
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | # Upstream has a custom autogen.sh which invokes po/update-potfiles as they | 22 | # Upstream has a custom autogen.sh which invokes po/update-potfiles as they |
23 | # don't ship a po/POTFILES.in (which is silly). Without that file gettext | 23 | # don't ship a po/POTFILES.in (which is silly). Without that file gettext |
24 | # doesn't believe po/ is a gettext directory and won't generate po/Makefile. | 24 | # doesn't believe po/ is a gettext directory and won't generate po/Makefile. |
25 | do_configure_prepend() { | 25 | do_configure:prepend() { |
26 | ( cd ${S} && po/update-potfiles ) | 26 | ( cd ${S} && po/update-potfiles ) |
27 | } | 27 | } |
28 | 28 | ||
@@ -31,7 +31,7 @@ EXTRA_OECONF = "--enable-skill --disable-modern-top" | |||
31 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 31 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
32 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" | 32 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" |
33 | 33 | ||
34 | do_install_append () { | 34 | do_install:append () { |
35 | install -d ${D}${base_bindir} | 35 | install -d ${D}${base_bindir} |
36 | [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done | 36 | [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done |
37 | install -d ${D}${base_sbindir} | 37 | install -d ${D}${base_sbindir} |
@@ -48,7 +48,7 @@ do_install_append () { | |||
48 | fi | 48 | fi |
49 | } | 49 | } |
50 | 50 | ||
51 | CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" | 51 | CONFFILES:${PN} = "${sysconfdir}/sysctl.conf" |
52 | 52 | ||
53 | bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w" | 53 | bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w" |
54 | base_bindir_progs += "kill pidof ps watch" | 54 | base_bindir_progs += "kill pidof ps watch" |
@@ -57,9 +57,9 @@ base_sbindir_progs += "sysctl" | |||
57 | ALTERNATIVE_PRIORITY = "200" | 57 | ALTERNATIVE_PRIORITY = "200" |
58 | ALTERNATIVE_PRIORITY[pidof] = "150" | 58 | ALTERNATIVE_PRIORITY[pidof] = "150" |
59 | 59 | ||
60 | ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" | 60 | ALTERNATIVE:${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" |
61 | 61 | ||
62 | ALTERNATIVE_${PN}-doc = "kill.1 uptime.1" | 62 | ALTERNATIVE:${PN}-doc = "kill.1 uptime.1" |
63 | ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" | 63 | ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" |
64 | ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" | 64 | ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" |
65 | 65 | ||
@@ -71,31 +71,27 @@ python __anonymous() { | |||
71 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) | 71 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) |
72 | } | 72 | } |
73 | 73 | ||
74 | # 'ps' isn't suitable for use as a security tool so whitelist this CVE. | ||
75 | # https://bugzilla.redhat.com/show_bug.cgi?id=1575473#c3 | ||
76 | CVE_CHECK_WHITELIST += "CVE-2018-1121" | ||
77 | |||
78 | PROCPS_PACKAGES = "${PN}-lib \ | 74 | PROCPS_PACKAGES = "${PN}-lib \ |
79 | ${PN}-ps \ | 75 | ${PN}-ps \ |
80 | ${PN}-sysctl" | 76 | ${PN}-sysctl" |
81 | 77 | ||
82 | PACKAGE_BEFORE_PN = "${PROCPS_PACKAGES}" | 78 | PACKAGE_BEFORE_PN = "${PROCPS_PACKAGES}" |
83 | RDEPENDS_${PN} += "${PROCPS_PACKAGES}" | 79 | RDEPENDS:${PN} += "${PROCPS_PACKAGES}" |
84 | 80 | ||
85 | RDEPENDS_${PN}-ps += "${PN}-lib" | 81 | RDEPENDS:${PN}-ps += "${PN}-lib" |
86 | RDEPENDS_${PN}-sysctl += "${PN}-lib" | 82 | RDEPENDS:${PN}-sysctl += "${PN}-lib" |
87 | 83 | ||
88 | FILES_${PN}-lib = "${libdir}" | 84 | FILES:${PN}-lib = "${libdir}" |
89 | FILES_${PN}-ps = "${base_bindir}/ps.${BPN}" | 85 | FILES:${PN}-ps = "${base_bindir}/ps.${BPN}" |
90 | FILES_${PN}-sysctl = "${base_sbindir}/sysctl.${BPN} ${sysconfdir}/sysctl.conf ${sysconfdir}/sysctl.d" | 86 | FILES:${PN}-sysctl = "${base_sbindir}/sysctl.${BPN} ${sysconfdir}/sysctl.conf ${sysconfdir}/sysctl.d" |
91 | 87 | ||
92 | ALTERNATIVE_${PN}_remove = "ps" | 88 | ALTERNATIVE:${PN}:remove = "ps" |
93 | ALTERNATIVE_${PN}_remove = "sysctl" | 89 | ALTERNATIVE:${PN}:remove = "sysctl" |
94 | 90 | ||
95 | ALTERNATIVE_${PN}-ps = "ps" | 91 | ALTERNATIVE:${PN}-ps = "ps" |
96 | ALTERNATIVE_TARGET[ps] = "${base_bindir}/ps" | 92 | ALTERNATIVE_TARGET[ps] = "${base_bindir}/ps" |
97 | ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" | 93 | ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" |
98 | 94 | ||
99 | ALTERNATIVE_${PN}-sysctl = "sysctl" | 95 | ALTERNATIVE:${PN}-sysctl = "sysctl" |
100 | ALTERNATIVE_TARGET[sysctl] = "${base_sbindir}/sysctl" | 96 | ALTERNATIVE_TARGET[sysctl] = "${base_sbindir}/sysctl" |
101 | ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl" \ No newline at end of file | 97 | ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl" |