diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2011-05-10 13:52:41 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 17:59:15 +0100 |
| commit | ad0594fef2d22f302533608ccb32b4e432d818e8 (patch) | |
| tree | 0dfd5e71c49a3cd0027ead5c6883be4f628a3e1f /meta/recipes-extended | |
| parent | 661b5fc9a02f209996ccd2213013a0fcab9a4fd7 (diff) | |
| download | poky-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>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/procps/procps_3.2.8.bb | 4 |
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 @@ | |||
| 1 | require procps.inc | 1 | require procps.inc |
| 2 | 2 | ||
| 3 | PR = "r0" | 3 | PR = "r1" |
| 4 | 4 | ||
| 5 | inherit update-rc.d update-alternatives | 5 | inherit update-rc.d update-alternatives |
| 6 | 6 | ||
| 7 | INITSCRIPT_NAME = "procps.sh" | 7 | INITSCRIPT_NAME = "procps.sh" |
| 8 | INITSCRIPT_PARAMS = "start 30 S ." | 8 | INITSCRIPT_PARAMS = "start 30 S ." |
| 9 | 9 | ||
| 10 | ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill \ | 10 | ALTERNATIVE_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" |
| 12 | ALTERNATIVE_PRIORITY = "90" | 12 | ALTERNATIVE_PRIORITY = "90" |
| 13 | 13 | ||