From eca12a65cb58e11743b287fec77f657d2ff074dc Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 9 Oct 2015 19:51:33 -0700 Subject: coreutils: fix ALTERNATIVE_PRIORITY conflict with procps and mktemp (From OE-Core rev: 2ce514a394e1e062172bb097aa92a1792a0f8eaf) Signed-off-by: Ross Burton Conflicts: coreutils and procps have the same priority 100 for kill.1 coreutils and procps have the same priority 100 for uptime.1 coreutils and procps have the same priority 100 for uptime coreutils and procps have the same priority 100 for kill coreutils and mktemp have the same priority 100 for mktemp Turn down coreutils' 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/coreutils/coreutils_8.24.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core/coreutils') diff --git a/meta/recipes-core/coreutils/coreutils_8.24.bb b/meta/recipes-core/coreutils/coreutils_8.24.bb index f042346241..b6ecc054b4 100644 --- a/meta/recipes-core/coreutils/coreutils_8.24.bb +++ b/meta/recipes-core/coreutils/coreutils_8.24.bb @@ -91,7 +91,7 @@ do_install_append_class-native(){ inherit update-alternatives -ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_PRIORITY = "30" ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1" -- cgit 1.2.3-korg