From: Robert Yang <liezhi.yang@windriver.com>
Date: Sat, 10 Oct 2015 02:51:33 +0000 (-0700)
Subject: debianutils: fix ALTERNATIVE_PRIORITY conflict with which
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5385ea8cfbe4779c67c54fe6684d08d46f34c54a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

debianutils: fix ALTERNATIVE_PRIORITY conflict with which

(From OE-Core rev: 268cf5c0b813a9dd5fead6883099c4e8ad9f81c0)

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

Conflicts:
debianutils and which have the same priority 100 for which

Turn down debianutils' priority to fix the conflict, the larger set
of tools should use a lower priority.

[YOCTO #8477]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/debianutils/debianutils_4.5.1.bb b/meta/recipes-support/debianutils/debianutils_4.5.1.bb
index 6b665fb2c3f..77ab6da0515 100644
--- a/meta/recipes-support/debianutils/debianutils_4.5.1.bb
+++ b/meta/recipes-support/debianutils/debianutils_4.5.1.bb
@@ -34,7 +34,7 @@ FILES_${PN}-run-parts = "${base_bindir}/run-parts.debianutils"
 RDEPENDS_${PN} += "${PN}-run-parts"
 
 
-ALTERNATIVE_PRIORITY="100"
+ALTERNATIVE_PRIORITY="30"
 ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which"
 ALTERNATIVE_${PN}-run-parts = "run-parts"