[oe-commits] Andreas Oberritter : procps: use update-alternatives for pwdx, pgrep and watch

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 68dc2a3fa30c03a196d650de34d0c657a7b85454
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=68dc2a3fa30c03a196d650de34d0c657a7b85454

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Fri Mar 23 17:37:36 2012 +0100

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 at opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/procps/procps_3.2.8.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index 27d2b5c..683badc 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 \