]> code.ossystems Code Review - openembedded-core.git/commitdiff
debianutils: fix ALTERNATIVE_PRIORITY conflict with which
authorRobert Yang <liezhi.yang@windriver.com>
Sat, 10 Oct 2015 02:51:33 +0000 (19:51 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 Nov 2015 11:20:00 +0000 (11:20 +0000)
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>
meta/recipes-support/debianutils/debianutils_4.5.1.bb

index 6b665fb2c3f879632a7cfafffd4b29128f59ece3..77ab6da0515076ee6ab87414bc88972f21a64d1f 100644 (file)
@@ -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"