summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-10-09 19:51:33 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:28 +0000
commit5385ea8cfbe4779c67c54fe6684d08d46f34c54a (patch)
tree9482fd2d31780f441c2ff0bf82334c3dd239a904
parent3a0bd40dfc6b359d771391bf4b8124600a811105 (diff)
downloadpoky-5385ea8cfbe4779c67c54fe6684d08d46f34c54a.tar.gz
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>
-rw-r--r--meta/recipes-support/debianutils/debianutils_4.5.1.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/debianutils/debianutils_4.5.1.bb b/meta/recipes-support/debianutils/debianutils_4.5.1.bb
index 6b665fb2c3..77ab6da051 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"
34RDEPENDS_${PN} += "${PN}-run-parts" 34RDEPENDS_${PN} += "${PN}-run-parts"
35 35
36 36
37ALTERNATIVE_PRIORITY="100" 37ALTERNATIVE_PRIORITY="30"
38ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" 38ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which"
39ALTERNATIVE_${PN}-run-parts = "run-parts" 39ALTERNATIVE_${PN}-run-parts = "run-parts"
40 40