summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-23 17:37:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 17:40:31 +0000
commit68dc2a3fa30c03a196d650de34d0c657a7b85454 (patch)
tree4bc8ca3dcb926b8dbef818d7d875a9f0e62b6488 /meta
parent3122da7cb2cbaf2f79c299acd5d2070caf07ec56 (diff)
downloadopenembedded-core-68dc2a3fa30c03a196d650de34d0c657a7b85454.tar.gz
openembedded-core-68dc2a3fa30c03a196d650de34d0c657a7b85454.tar.bz2
openembedded-core-68dc2a3fa30c03a196d650de34d0c657a7b85454.tar.xz
openembedded-core-68dc2a3fa30c03a196d650de34d0c657a7b85454.zip
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/procps/procps_3.2.8.bb5
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 27d2b5ca4..683badc2f 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 \