diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-10-09 19:51:33 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:39:28 +0000 |
commit | eca12a65cb58e11743b287fec77f657d2ff074dc (patch) | |
tree | f3b647ab018338b17fa9175139169c7afd885e07 | |
parent | 8de5315bd519c21a114bc88b88c6caff32831c03 (diff) | |
download | poky-eca12a65cb58e11743b287fec77f657d2ff074dc.tar.gz |
coreutils: fix ALTERNATIVE_PRIORITY conflict with procps and mktemp
(From OE-Core rev: 2ce514a394e1e062172bb097aa92a1792a0f8eaf)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.24.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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(){ | |||
91 | 91 | ||
92 | inherit update-alternatives | 92 | inherit update-alternatives |
93 | 93 | ||
94 | ALTERNATIVE_PRIORITY = "100" | 94 | ALTERNATIVE_PRIORITY = "30" |
95 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" | 95 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" |
96 | ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1" | 96 | ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1" |
97 | 97 | ||