From: Robert Yang <liezhi.yang@windriver.com>
Date: Sat, 10 Oct 2015 02:51:33 +0000 (-0700)
Subject: console-tools: fix ALTERNATIVE_PRIORITY conflict with kbd
X-Git-Tag: 2016-4~2389
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=839849f5cb7e4dab92d0566f87b04beab773f2be;p=openembedded-core.git

console-tools: fix ALTERNATIVE_PRIORITY conflict with kbd

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>
---

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 () {
 
 inherit autotools gettext update-alternatives
 
-ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_PRIORITY = "30"
 
 bindir_progs = "chvt deallocvt fgconsole openvt"
 ALTERNATIVE_${PN} = "${bindir_progs}"