meta: fix ALTERNATIVE_PRIORITY conflicts

The following changes since commit 4038970f8ce27ac0d7a0afe2cdaa9a65108dfff5:

os-release: fix do_compile() when RPM signing is enabled (2015-10-07 00:08:07 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/alternatives
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/alternatives

Robert Yang (5):
debianutils: fix ALTERNATIVE_PRIORITY conflict with which
console-tools: fix ALTERNATIVE_PRIORITY conflict with kbd
util-linux: fix ALTERNATIVE_PRIORITY conflict with ncurses procps and
e2fsprogs
coreutils: fix ALTERNATIVE_PRIORITY conflict with procps and mktemp gtk+3: fix ALTERNATIVE_PRIORITY conflict with gtk+

 .../console-tools/console-tools_0.3.2.bb           |    2 +-
 meta/recipes-core/coreutils/coreutils_8.24.bb      |    2 +-
 meta/recipes-core/util-linux/util-linux.inc        |    2 +-
 meta/recipes-gnome/gtk+/gtk+3.inc                  |    1 +
 .../debianutils/debianutils_4.5.1.bb               |    2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

1.7.9.5

Conflicts:
debianutils and which have the same priority 100 for which

Turn down debianutils' priority to fix the conflict, the larger set of tools should use a lower priority.

[YOCTO #8477]

---
 .../debianutils/debianutils_4.5.1.bb               |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 6b665fb..77ab6da 100644
@@ -34,7 +34,7 @@ FILES_${PN}-run-parts = "${base_bindir}/run-parts.debianutils"
 RDEPENDS_${PN} += "${PN}-run-parts"
 
 
-ALTERNATIVE_PRIORITY="100"
+ALTERNATIVE_PRIORITY="30"
 ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which"
 ALTERNATIVE_${PN}-run-parts = "run-parts"
 

1.7.9.5

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]

---
 .../console-tools/console-tools_0.3.2.bb           |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index c60a5a0..a9805b3 100644
@@ -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}"

1.7.9.5

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]

---
 meta/recipes-core/util-linux/util-linux.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 594108f..48d7e89 100644
@@ -177,7 +177,7 @@ do_install_append_class-native () {
 	rm -f ${D}${base_sbindir}/nologin
 }
 
-ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_PRIORITY = "50"
 
 ALTERNATIVE_${PN}  = "dmesg kill more mkswap blockdev pivot_root switch_root"
 ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall"

1.7.9.5

Conflicts:
coreutils and procps have the same priority 100 for kill.1 coreutils and procps have the same priority 100 for uptime.1 coreutils and procps have the same priority 100 for uptime coreutils and procps have the same priority 100 for kill coreutils and mktemp have the same priority 100 for mktemp

Turn down coreutils' priority to fix the conflict, the larger set of tools should use a lower priority.

[YOCTO #8477]

---
 meta/recipes-core/coreutils/coreutils_8.24.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 034ebcd..4519aab 100644
@@ -91,7 +91,7 @@ do_install_append_class-native(){
 
 inherit update-alternatives
 
-ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_PRIORITY = "30"
 ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df"
 ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1"
 

1.7.9.5

Conflicts:
gtk+3 and gtk+ have the same priority 10 for gtk-update-icon-cache

Turn up gtk+3's priority to fix the conflict.

[YOCTO #8477]

---
 meta/recipes-gnome/gtk+/gtk+3.inc |    1 +
 1 file changed, 1 insertion(+)

index 558cdd7..5bbac07 100644
@@ -92,6 +92,7 @@ PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*"
 
 ALTERNATIVE_${PN} = "gtk-update-icon-cache"
 ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0"
+ALTERNATIVE_PRIORITY = "30"
 
 python populate_packages_prepend () {
     import os.path

1.7.9.5