From: Martin Jansa <martin.jansa@gmail.com>
Date: Tue, 10 May 2011 11:52:41 +0000 (+0200)
Subject: procps: use u-a for pmap, otherwise conflicts with pmap from busybox
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~45616
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24cc1131e538a7aba4ca6cabc3542f036cad97f6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

procps: use u-a for pmap, otherwise conflicts with pmap from busybox

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index f694612a02b..b1a7de70502 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 @@
 require procps.inc
 
-PR = "r0"
+PR = "r1"
 
 inherit update-rc.d update-alternatives
 
 INITSCRIPT_NAME = "procps.sh"
 INITSCRIPT_PARAMS = "start 30 S ."
 
-ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill \
+ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \
                      ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps"
 ALTERNATIVE_PRIORITY = "90"