From 8de5315bd519c21a114bc88b88c6caff32831c03 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 9 Oct 2015 19:51:33 -0700 Subject: util-linux: fix ALTERNATIVE_PRIORITY conflict with ncurses procps and e2fsprogs (From OE-Core rev: 2a1a92ad3a315511df0ff1d2b541226713aab1f9) Signed-off-by: Ross Burton Conflicts: util-linux and ncurses have the same priority 100 for reset util-linux and procps have the same priority 100 for kill.1 util-linux and procps have the same priority 100 for kill e2fsprogs and util-linux have the same priority 100 for libblkid.3 e2fsprogs and util-linux have the same priority 100 for blkid.8 e2fsprogs and util-linux have the same priority 100 for findfs.8 e2fsprogs and util-linux have the same priority 100 for fsck.8 Turn down util-linux' priority to fix the conflict, the larger set of tools should use a lower priority. [YOCTO #8477] Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core/util-linux/util-linux.inc') diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 594108f68c..48d7e898f2 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -177,7 +177,7 @@ do_install_append_class-native () { rm -f ${D}${base_sbindir}/nologin } -ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_PRIORITY = "50" ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall" -- cgit v1.2.3-54-g00ecf