summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-08-28 06:41:43 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:53:08 (GMT)
commita512e682026e3a9731df4d3147f9beff369f81e1 (patch)
treed3ca732690d1c23bd462e3f2390ccd11986138c1 /meta/recipes-extended
parentef789c1327d9548317ea5da10027f7e354ced939 (diff)
downloadpoky-a512e682026e3a9731df4d3147f9beff369f81e1.tar.gz
man: make man actually work by installing custom man.config
The default man.conf is named wrong and doesn't work. It references gtbl, while groff installs tbl and other things. This man.conf is imported from OE classic and runtime tested on angstrom. Before: root@beaglebone:~# man man sh: /usr/bin/gtbl: No such file or directory sh: line 0: echo: write error: Broken pipe gunzip: write: Broken pipe gunzip: error inflating sh: line 0: echo: write error: Broken pipe sh: line 0: echo: write error: Broken pipe After: root@beaglebone:~# man man MAN(1) Manual pager utils MAN(1) NAME man - an interface to the on-line reference manuals SYNOPSIS man [-C file] [-d] [-D] [--warnings[=warnings]] [-R encoding] [-L locale] [-m system[,...]] [-M path] [-S list] [-e extension] [-i|-I] [--regex|--wildcard] [--names-only] [-a] [-u] [--no-subpages] [-P pager] [-r prompt] [-7] [-E encoding] [--no-hyphenation] [--no-justifi- cation] [-p string] [-t] [-T[device]] [-H[browser]] [-X[dpi]] [-Z] [[section] page ...] ... man -k [apropos options] regexp ... man -K [-w|-W] [-S list] [-i|-I] [--regex] [section] term ... man -f [whatis options] page ... man -l [-C file] [-d] [-D] [--warnings[=warnings]] [-R encoding] [-L locale] [-P pager] [-r prompt] [-7] [-E encoding] [-p string] [-t] [-T[device]] [-H[browser]] [-X[dpi]] [-Z] file ... man -w|-W [-C file] [-d] [-D] page ... man -c [-C file] [-d] [-D] page ... man [-hV] Check for config name: root@beaglebone:~# rm /etc/man.config root@beaglebone:~# man man Warning: cannot open configuration file /etc/man.config No manual entry for man As a bonus a bunch of references to the buildhost get removed from the config file. (From OE-Core rev: 13d82ecd6b25ff4c34b3639e10113d7ebb33dc88) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/man/man-1.6f/man.conf140
-rw-r--r--meta/recipes-extended/man/man_1.6f.bb6
2 files changed, 143 insertions, 3 deletions
diff --git a/meta/recipes-extended/man/man-1.6f/man.conf b/meta/recipes-extended/man/man-1.6f/man.conf
new file mode 100644
index 0000000..bb3c697
--- /dev/null
+++ b/meta/recipes-extended/man/man-1.6f/man.conf
@@ -0,0 +1,140 @@
1#
2# Generated automatically from man.conf.in by the
3# configure script.
4#
5# man.conf from man-1.5p
6#
7# For more information about this file, see the man pages man(1)
8# and man.conf(5).
9#
10# This file is read by man to configure the default manpath (also used
11# when MANPATH contains an empty substring), to find out where the cat
12# pages corresponding to given man pages should be stored,
13# and to map each PATH element to a manpath element.
14# It may also record the pathname of the man binary. [This is unused.]
15# The format is:
16#
17# MANBIN pathname
18# MANPATH manpath_element [corresponding_catdir]
19# MANPATH_MAP path_element manpath_element
20#
21# If no catdir is given, it is assumed to be equal to the mandir
22# (so that this dir has both man1 etc. and cat1 etc. subdirs).
23# This is the traditional Unix setup.
24# Certain versions of the FSSTND recommend putting formatted versions
25# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
26# The keyword FSSTND will cause this behaviour.
27# Certain versions of the FHS recommend putting formatted versions of
28# /usr/.../share/man/[locale/]manx/page.x into
29# /var/cache/man/.../[locale/]catx/page.x.
30# The keyword FHS will cause this behaviour (and overrides FSSTND).
31# Explicitly given catdirs override.
32#
33# FSSTND
34FHS
35#
36# This file is also read by man in order to find how to call nroff, less, etc.,
37# and to determine the correspondence between extensions and decompressors.
38#
39# MANBIN /usr/local/bin/man
40#
41# Every automatically generated MANPATH includes these fields
42#
43MANPATH /usr/man
44MANPATH /usr/share/man
45MANPATH /usr/local/man
46MANPATH /usr/local/share/man
47MANPATH /usr/X11R6/man
48#
49# Uncomment if you want to include one of these by default
50#
51# MANPATH /opt/*/man
52# MANPATH /usr/lib/*/man
53# MANPATH /usr/share/*/man
54# MANPATH /usr/kerberos/man
55#
56# Set up PATH to MANPATH mapping
57#
58# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
59# and the docs are found in "/dir/man", then no mapping is required.
60#
61# The below mappings are superfluous when the right hand side is
62# in the mandatory manpath already, but will keep man from statting
63# lots of other nearby files and directories.
64#
65MANPATH_MAP /bin /usr/share/man
66MANPATH_MAP /sbin /usr/share/man
67MANPATH_MAP /usr/bin /usr/share/man
68MANPATH_MAP /usr/sbin /usr/share/man
69MANPATH_MAP /usr/local/bin /usr/local/share/man
70MANPATH_MAP /usr/local/sbin /usr/local/share/man
71MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
72MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
73MANPATH_MAP /usr/bin/mh /usr/share/man
74#
75# NOAUTOPATH keeps man from automatically adding directories that look like
76# manual page directories to the path.
77#
78#NOAUTOPATH
79#
80# NOCACHE keeps man from creating cache pages ("cat pages")
81# (generally one enables/disable cat page creation by creating/deleting
82# the directory they would live in - man never does mkdir)
83#
84#NOCACHE
85#
86# Useful paths - note that COL should not be defined when
87# NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
88# not only is it superfluous, but it actually damages the output.
89# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
90# (Maybe - but today I need -Tlatin1 to prevent double conversion to utf8.)
91#
92# If you have a new troff (version 1.18.1?) and its colored output
93# causes problems, add the -c option to TROFF, NROFF, JNROFF.
94#
95TROFF /usr/bin/groff -Tps -mandoc
96NROFF /usr/bin/nroff -Tlatin1 -mandoc
97JNROFF /usr/bin/groff -Tnippon -mandocj
98EQN /usr/bin/eqn -Tps
99NEQN /usr/bin/eqn -Tlatin1
100JNEQN /usr/bin/eqn -Tnippon
101TBL /usr/bin/tbl
102# COL /usr/bin/col
103REFER /usr/bin/refer
104PIC /usr/bin/pic
105VGRIND
106GRAP
107PAGER /usr/bin/less -isR
108CAT /bin/cat
109#
110# The command "man -a xyzzy" will show all man pages for xyzzy.
111# When CMP is defined man will try to avoid showing the same
112# text twice. (But compressed pages compare unequal.)
113#
114CMP /usr/bin/cmp -s
115#
116# Compress cat pages
117#
118COMPRESS /bin/bzip2
119COMPRESS_EXT .bz2
120#
121# Default manual sections (and order) to search if -S is not specified
122# and the MANSECT environment variable is not set.
123#
124MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
125#
126# Default options to use when man is invoked without options
127# This is mainly for the benefit of those that think -a should be the default
128# Note that some systems have /usr/man/allman, causing pages to be shown twice.
129#
130#MANDEFOPTIONS -a
131#
132# Decompress with given decompressor when input file has given extension
133# The command given must act as a filter.
134#
135.gz /bin/gunzip -c
136.bz2 /bin/bzip2 -c -d
137.z
138.Z /bin/zcat
139.F
140.Y
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index b35621a..3a36a5b 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" 6LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
7 7
8PR = "r3" 8PR = "r4"
9 9
10DEPENDS = "groff less" 10DEPENDS = "groff less"
11 11
@@ -54,7 +54,7 @@ do_install_append(){
54 mkdir -p ${D}/etc/ 54 mkdir -p ${D}/etc/
55 mkdir -p ${D}${datadir}/man/man5 55 mkdir -p ${D}${datadir}/man/man5
56 mkdir -p ${D}${datadir}/man/man7 56 mkdir -p ${D}${datadir}/man/man7
57 cp ${S}/src/man.conf ${D}/etc/ 57 cp ${WORKDIR}/man.conf ${D}/etc/man.config
58 cp ${WORKDIR}/man.1.gz ${D}${datadir}/man/man1/ 58 cp ${WORKDIR}/man.1.gz ${D}${datadir}/man/man1/
59 cp ${WORKDIR}/man.7.gz ${D}${datadir}/man/man7/ 59 cp ${WORKDIR}/man.7.gz ${D}${datadir}/man/man7/
60 cp ${WORKDIR}/manpath.5.gz ${D}${datadir}/man/man5/ 60 cp ${WORKDIR}/manpath.5.gz ${D}${datadir}/man/man5/
@@ -62,4 +62,4 @@ do_install_append(){
62 62
63 63
64RDEPENDS_${PN} = "less groff" 64RDEPENDS_${PN} = "less groff"
65FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.conf" 65FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"