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 | 3befb43afa6f4b3079c77371eb22c244bf648b95 (patch) | |
| tree | 14adcc77419aa2803a93587c421959abec5b3eda /meta | |
| parent | 5385ea8cfbe4779c67c54fe6684d08d46f34c54a (diff) | |
| download | poky-3befb43afa6f4b3079c77371eb22c244bf648b95.tar.gz | |
console-tools: fix ALTERNATIVE_PRIORITY conflict with kbd
(From OE-Core rev: 839849f5cb7e4dab92d0566f87b04beab773f2be)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Conflicts:
console-tools and kbd have the same priority 100 for chvt
console-tools and kbd have the same priority 100 for deallocvt
console-tools and kbd have the same priority 100 for fgconsole
console-tools and kbd have the same priority 100 for openvt
Turn down console-tools' 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')
| -rw-r--r-- | meta/recipes-core/console-tools/console-tools_0.3.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb index c60a5a05bb..a9805b3fe8 100644 --- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb +++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb | |||
| @@ -29,7 +29,7 @@ do_configure_prepend () { | |||
| 29 | 29 | ||
| 30 | inherit autotools gettext update-alternatives | 30 | inherit autotools gettext update-alternatives |
| 31 | 31 | ||
| 32 | ALTERNATIVE_PRIORITY = "100" | 32 | ALTERNATIVE_PRIORITY = "30" |
| 33 | 33 | ||
| 34 | bindir_progs = "chvt deallocvt fgconsole openvt" | 34 | bindir_progs = "chvt deallocvt fgconsole openvt" |
| 35 | ALTERNATIVE_${PN} = "${bindir_progs}" | 35 | ALTERNATIVE_${PN} = "${bindir_progs}" |