summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-05-10 13:52:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 17:59:15 +0100
commitad0594fef2d22f302533608ccb32b4e432d818e8 (patch)
tree0dfd5e71c49a3cd0027ead5c6883be4f628a3e1f
parent661b5fc9a02f209996ccd2213013a0fcab9a4fd7 (diff)
downloadpoky-ad0594fef2d22f302533608ccb32b4e432d818e8.tar.gz
procps: use u-a for pmap, otherwise conflicts with pmap from busybox
(From OE-Core rev: 24cc1131e538a7aba4ca6cabc3542f036cad97f6) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/procps/procps_3.2.8.bb4
1 files changed, 2 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 f694612a02..b1a7de7050 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,13 +1,13 @@
1require procps.inc 1require procps.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5inherit update-rc.d update-alternatives 5inherit update-rc.d update-alternatives
6 6
7INITSCRIPT_NAME = "procps.sh" 7INITSCRIPT_NAME = "procps.sh"
8INITSCRIPT_PARAMS = "start 30 S ." 8INITSCRIPT_PARAMS = "start 30 S ."
9 9
10ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill \ 10ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \
11 ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps" 11 ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps"
12ALTERNATIVE_PRIORITY = "90" 12ALTERNATIVE_PRIORITY = "90"
13 13