From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 23 Mar 2012 16:37:36 +0000 (+0100)
Subject: procps: use update-alternatives for pwdx, pgrep and watch
X-Git-Tag: 2015-4~11185
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=68dc2a3fa30c03a196d650de34d0c657a7b85454;p=openembedded-core.git

procps: use update-alternatives for pwdx, pgrep and watch

* pwdx, pgrep and watch may be provided by busybox.
* Use update-alternatives to avoid conflict.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index 27d2b5ca46..683badc2f9 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,11 +1,12 @@
 require procps.inc
 
-PR = "r5"
+PR = "r6"
 
 inherit update-alternatives
 
 ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \
-                     ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps"
+                     ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \
+                     ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch"
 ALTERNATIVE_PRIORITY = "110"
 
 SRC_URI += "file://procmodule.patch \