From 5097cf24f0ac29307ed307ebf0651b7f570fc41e Mon Sep 17 00:00:00 2001 From: Niko Mauno Date: Fri, 20 Apr 2018 17:09:28 +0300 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/procps/procps_3.3.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') 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 () { CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" -bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime" +bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w" base_bindir_progs += "kill pidof ps watch" base_sbindir_progs += "sysctl" -- cgit v1.2.3-54-g00ecf