From 8132ac5f6cae22a3184ffbf6d23d0371b0d1ce5f Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 23 Mar 2012 17:37:36 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-extended/procps/procps_3.2.8.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb index 27d2b5ca46..683badc2f9 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 \ -- cgit v1.2.3-54-g00ecf