diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-15 16:34:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-16 11:56:30 +0000 |
| commit | f19e8de4cfafa86aa90e27dded89d815537b9825 (patch) | |
| tree | 2f064b36cf3e0908c69c913d8f7bd0392673525a /meta/recipes-core | |
| parent | 455ff3242627f6e3178e44b5d43468a9ae81584c (diff) | |
| download | poky-f19e8de4cfafa86aa90e27dded89d815537b9825.tar.gz | |
coreutils/procps: Revert priority change since coreutils > busybox
In 2ce514a394e1e062172bb097aa92a1792a0f8eaf, "coreutils: fix
ALTERNATIVE_PRIORITY conflict with procps and mktemp" the priority was
lowered from 100 to 30. Unfortunately this lowered coreutils past
busybox which means busybox was ending up in our SDK images. This isn't
what users expect.
1c0cfffee21e99a7356c9046c86628bc0acf654c raises the priority of mktemp
to 200, do the same for procps and make the system consistent.
(From OE-Core rev: 770618eb33fc576f903a4c8011cc2d9f8f78071d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -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 b6ecc054b4..f042346241 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 = "30" | 94 | ALTERNATIVE_PRIORITY = "100" |
| 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 | ||