diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 11:29:05 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:39:01 +0000 |
| commit | 9d9f23333bfc24660f360e189d5f6478f546f8a2 (patch) | |
| tree | a6797cbec90e6085472e6cc3ec8b1f499675c45e /meta/recipes-core | |
| parent | 8f2306ccba702506824bda02dc1c99b35986a7e0 (diff) | |
| download | poky-9d9f23333bfc24660f360e189d5f6478f546f8a2.tar.gz | |
util-linux: Change ALTERNATIVE_PRIORITY above busybox
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=8de5315bd519c21a114bc88b88c6caff32831c03
changed util-linux priority to match busybox (50) which means sometimes
one and sometimes the other wins in image installs. We want util-linux to
win compared to busybox.
The old level (100) does conflict with other utils so pick 80 as a
good intermediate value.
(From OE-Core rev: 97afba61ab5124fab68c97609920d2cb67774174)
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 f57284bfce..08ca040a2e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
| @@ -184,7 +184,7 @@ do_install_append_class-native () { | |||
| 184 | rm -f ${D}${base_sbindir}/nologin | 184 | rm -f ${D}${base_sbindir}/nologin |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | ALTERNATIVE_PRIORITY = "50" | 187 | ALTERNATIVE_PRIORITY = "80" |
| 188 | 188 | ||
| 189 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" | 189 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" |
| 190 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall" | 190 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall" |