]> code.ossystems Code Review - openembedded-core.git/commitdiff
coreutils: fix ALTERNATIVE_PRIORITY conflict with procps and mktemp
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:04 +0000 (11:20 +0000)
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-core/coreutils/coreutils_8.24.bb

index f042346241dac6a457b131be8709b613242a54c5..b6ecc054b4bd9a7c2e5a2461ca072b904771940b 100644 (file)
@@ -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"