[PATCH 0/3] Fix doc pkg conflicts

[PATCH 0/3] Fix doc pkg conflicts

[Paul Gortmaker]

Something must have enabled more strict checking on doc package confilcts
as these recently showed up:

 Error: Transaction check error:
   file /usr/share/man/man1/dnsdomainname.1 conflicts between attempted installs of inetutils-doc-1.9.4-r0.core2_64 and net-tools-doc-1.60+26-r0.core2_64
   file /usr/share/man/man8/syslogd.8 conflicts between attempted installs of inetutils-doc-1.9.4-r0.core2_64 and sysklogd-doc-1.5.1-r0.core2_64
   file /usr/share/man/man1/eject.1 conflicts between attempted installs of util-linux-doc-2.29.1-r0.core2_64 and eject-doc-2.1.5-r1.core2_64
   file /usr/share/man/man1/logger.1 conflicts between attempted installs of util-linux-doc-2.29.1-r0.core2_64 and inetutils-doc-1.9.4-r0.core2_64

 [log_check] Warn: update-alternatives: logger.1 has multiple providers with the same priority, please check rootfs/usr/lib/opkg/alternatives/logger.1 for details

An accompanying series has already been sent to oe-core.

Paul Gortmaker (3):
  inetutils: bump priority to avoid conflict issue
  eject: use update-alternatives for manpage
  inetutils: use update-alternatives for more manpages

 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 7 +++++--
 meta-oe/recipes-support/eject/eject_2.1.5.bb                      | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.7.4

[PATCH 1/3] inetutils: bump priority to avoid conflict issue

[Paul Gortmaker]

To fix:

 [log_check] Warn: update-alternatives: logger.1 has multiple providers
 with the same priority, please check
 tmp/work/genericx86_64-overc-linux/cube-graphical-builder/0.2-r0/rootfs/usr/lib/opkg/alternatives/logger.1
 for details

In that file we see:
 /usr/share/man/man1/logger.1
 /usr/share/man/man1/logger.1.util-linux 80
 /usr/share/man/man1/logger.1.inetutils 80

Since most people would probably expect the util-linux version, we
drop inetutils by one.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index b42b197fdd19..9a065c3f47a9 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -107,7 +107,7 @@ ${PN}-rsh ${PN}-rshd"
 PACKAGES =+ "${PN}-tftpd-dbg ${PN}-telnetd-dbg ${PN}-rshd-dbg"
 NOAUTOPACKAGEDEBUG = "1"
 
-ALTERNATIVE_PRIORITY = "80"
+ALTERNATIVE_PRIORITY = "79"
 ALTERNATIVE_${PN} = "talk whois"
 ALTERNATIVE_LINK_NAME[talkd]  = "${sbindir}/in.talkd"
 ALTERNATIVE_LINK_NAME[uucpd]  = "${sbindir}/in.uucpd"
-- 
2.7.4

[PATCH 2/3] eject: use update-alternatives for manpage

[Paul Gortmaker]

To fix:

   file /usr/share/man/man1/eject.1 conflicts between attempted installs
   of util-linux-doc-2.29.1-r0.core2_64 and eject-doc-2.1.5-r1.core2_64

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 meta-oe/recipes-support/eject/eject_2.1.5.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index 0440f0c37075..49a3d74f6fcd 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -33,3 +33,5 @@ ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
 ALTERNATIVE_PRIORITY[volname] = "100"
 ALTERNATIVE_PRIORITY[eject] = "100"
 
+ALTERNATIVE_${PN}-doc = "eject.1"
+ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1"
-- 
2.7.4

[PATCH 3/3] inetutils: use update-alternatives for more manpages

[Paul Gortmaker]

To fix:

   file /usr/share/man/man1/dnsdomainname.1 conflicts between attempted installs
   of inetutils-doc-1.9.4-r0.core2_64 and net-tools-doc-1.60+26-r0.core2_64

   file /usr/share/man/man8/syslogd.8 conflicts between attempted installs
   of inetutils-doc-1.9.4-r0.core2_64 and sysklogd-doc-1.5.1-r0.core2_64

   file /usr/share/man/man1/logger.1 conflicts between attempted installs
   of util-linux-doc-2.29.1-r0.core2_64 and inetutils-doc-1.9.4-r0.core2_64

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index 9a065c3f47a9..55eb137ee841 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -144,8 +144,11 @@ ALTERNATIVE_${PN}-traceroute = "traceroute"
 ALTERNATIVE_${PN}-hostname = "hostname"
 ALTERNATIVE_LINK_NAME[hostname]  = "${base_bindir}/hostname"
 
-ALTERNATIVE_${PN}-doc = "hostname.1"
+ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8"
 ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
+ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
+ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1"
+ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8"
 
 ALTERNATIVE_${PN}-ifconfig = "ifconfig"
 ALTERNATIVE_LINK_NAME[ifconfig]  = "${base_sbindir}/ifconfig"
-- 
2.7.4