summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNiko Mauno <niko.mauno@vaisala.com>2018-04-20 17:09:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:05 +0100
commit5097cf24f0ac29307ed307ebf0651b7f570fc41e (patch)
treeb1e3bca3807cfcc353c98478a66b8537b88c3d50 /meta
parent51394baea4109ad130e0806848773734db0ca49f (diff)
downloadpoky-5097cf24f0ac29307ed307ebf0651b7f570fc41e.tar.gz
procps: Complement update-alternatives scope
Avoid collision of propcs provided w binary with BusyBox-provided applet in case both are installed to same rootfs, by adding w to update-alternatives scope via bindir_progs variable (From OE-Core rev: de4206c6fd0c3be77d71958f532604b65a4dd5be) Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/procps/procps_3.3.12.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-extended/procps/procps_3.3.12.bb b/meta/recipes-extended/procps/procps_3.3.12.bb
index 99e43c5349..ecf215fecf 100644
--- a/meta/recipes-extended/procps/procps_3.3.12.bb
+++ b/meta/recipes-extended/procps/procps_3.3.12.bb
@@ -42,7 +42,7 @@ do_install_append () {
42 42
43CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" 43CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
44 44
45bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime" 45bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w"
46base_bindir_progs += "kill pidof ps watch" 46base_bindir_progs += "kill pidof ps watch"
47base_sbindir_progs += "sysctl" 47base_sbindir_progs += "sysctl"
48 48