summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-23 16:37:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 17:47:41 (GMT)
commit8132ac5f6cae22a3184ffbf6d23d0371b0d1ce5f (patch)
treebb3db5b3a5362f1f6076a8f9213748850e93307b /meta/recipes-extended
parentb2c6e1ead7152e55030d4dce3d6333326643871d (diff)
downloadpoky-8132ac5f6cae22a3184ffbf6d23d0371b0d1ce5f.tar.gz
procps: use update-alternatives for pwdx, pgrep and watch
* pwdx, pgrep and watch may be provided by busybox. * Use update-alternatives to avoid conflict. (From OE-Core rev: 68dc2a3fa30c03a196d650de34d0c657a7b85454) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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 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 @@
1require procps.inc 1require procps.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5inherit update-alternatives 5inherit update-alternatives
6 6
7ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \ 7ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \
8 ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps" 8 ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \
9 ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch"
9ALTERNATIVE_PRIORITY = "110" 10ALTERNATIVE_PRIORITY = "110"
10 11
11SRC_URI += "file://procmodule.patch \ 12SRC_URI += "file://procmodule.patch \