From: Chen Qi <Qi.Chen@windriver.com>
Date: Fri, 10 Mar 2017 07:03:05 +0000 (+0800)
Subject: procps: fix ALTERNATIVE_PRIORITY to avoid conflict
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~22014
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=468f9c9899016c46635c9f39eef3483303a5be81;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

procps: fix ALTERNATIVE_PRIORITY to avoid conflict

Previously, 'pidof' utility has two providers, sysvinit and procps, and
both have the same priority 200. Fix procps to lower the priority of its
'pidof' to 150 to avoid conflict.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-extended/procps/procps_3.3.12.bb b/meta/recipes-extended/procps/procps_3.3.12.bb
index 1f793b9cac0..adabd757617 100644
--- a/meta/recipes-extended/procps/procps_3.3.12.bb
+++ b/meta/recipes-extended/procps/procps_3.3.12.bb
@@ -49,6 +49,7 @@ base_bindir_progs += "kill pidof ps watch"
 base_sbindir_progs += "sysctl"
 
 ALTERNATIVE_PRIORITY = "200"
+ALTERNATIVE_PRIORITY[pidof] = "150"
 
 ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}"