From 2418ea389b22dfbaaf7bb68ca73865a8a0292a93 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Thu, 26 Jan 2017 18:18:11 -0500 Subject: inetutils: register hostname.1 man page as an alternate The coreutils has a hostname command; this package already dealt with that existing as an alternate, but for some reason it did not do the same with the manpage of the same name. The conflict varied from intermittent to "why does this keep happening to me?!?". Mark gets credit for the fix; he didn't want to bear witness to yet another premature death of a USB keyboard and suggested the change here; which I then largely just confirmed as functional, since I happened to "be so lucky" as to have the reproducer. The failure showed up in do_rootfs as follows: ERROR: cube-graphical-builder-0.2-r0 do_rootfs: [log_check] cube-graphical-builder: found 1 error message in the logfile: [log_check] update-alternatives: Error: not linking tmp/work/qemuarm64-overc-linux/cube-graphical-builder/0.2-r0/rootfs/usr/share/man/man1/hostname.1 to /usr/share/man/man1/hostname.1.coreutils since tmp/work/qemuarm64-overc-linux/cube-graphical-builder/0.2-r0/rootfs/usr/share/man/man1/hostname.1 exists and is not a link Cc: Mark Hatle Cc: Joe MacDonald Signed-off-by: Paul Gortmaker Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-networking') 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 a8c40254ba..e3c2781766 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb @@ -143,6 +143,9 @@ ALTERNATIVE_${PN}-traceroute = "traceroute" ALTERNATIVE_${PN}-hostname = "hostname" ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" +ALTERNATIVE_${PN}-doc = "hostname.1" +ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" + ALTERNATIVE_${PN}-ifconfig = "ifconfig" ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" -- cgit 1.2.3-korg