summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-03-16 10:20:54 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-17 16:53:04 +0000
commitc6532a199a93a5b04864a5d5094a1071d05cc3be (patch)
tree247887cde50f700fe8ad30e11140e8b9ac035251 /meta/recipes-core
parent4a660aa437228b39befe04335a0d6f4e21ed5d2a (diff)
downloadpoky-c6532a199a93a5b04864a5d5094a1071d05cc3be.tar.gz
util-linux: use update-alternatives for more manpages
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 and 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 (From OE-Core rev: a65e69d006bceacb042b377f2cd0dd8a3e72ea62) Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 821f7c8751..708c041d20 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -205,7 +205,7 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
205ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" 205ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
206ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 206ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
207 207
208ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3" 208ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1"
209 209
210ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" 210ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
211ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" 211ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1"
@@ -222,6 +222,8 @@ ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8"
222ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" 222ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8"
223ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" 223ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
224ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" 224ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3"
225ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1"
226ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1"
225 227
226ALTERNATIVE_util-linux-hwclock = "hwclock" 228ALTERNATIVE_util-linux-hwclock = "hwclock"
227ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" 229ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock"