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 | 8de5315bd519c21a114bc88b88c6caff32831c03 (patch) | |
| tree | 86e58128e3e8b0504dfa9bf2c944943d8b2ea059 /meta/recipes-core | |
| parent | 3befb43afa6f4b3079c77371eb22c244bf648b95 (diff) | |
| download | poky-8de5315bd519c21a114bc88b88c6caff32831c03.tar.gz | |
util-linux: fix ALTERNATIVE_PRIORITY conflict with ncurses procps and e2fsprogs
(From OE-Core rev: 2a1a92ad3a315511df0ff1d2b541226713aab1f9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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 () { | |||
| 177 | rm -f ${D}${base_sbindir}/nologin | 177 | rm -f ${D}${base_sbindir}/nologin |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | ALTERNATIVE_PRIORITY = "100" | 180 | ALTERNATIVE_PRIORITY = "50" |
| 181 | 181 | ||
| 182 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" | 182 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" |
| 183 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall" | 183 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall" |