Commit Graph

26 Commits

Author SHA1 Message Date
Joshua Lock c4e2c59088 meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.

Search made with the following regex: getVar ?\(( ?[^,()]*), True\)

(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-16 10:23:23 +00:00
Bill Randle 5293b834c1 man: use BUILD_CC and target include files for configure
The configure script was using the cross-compiler for feature tests,
which fails to execute when the target is different than the host.
Change the script to use the build compiler instead, but use the
target include files to check for the target features.

[YOCTO #9359]

(From OE-Core rev: c0e0d061d94a1ed2930cbf9a9445cf8cb9f4f9b3)

Signed-off-by: Bill Randle <william.c.randle@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-01 07:14:30 +01:00
Bill Randle 9e588481f8 man: fix several annoying compile/build warnings
Fixed the build error when building man.config.5 (a remnant of a long
ago previous patch). Optimized the manpages Makefile for parallel
builds. Drop a FHS patch that is no longer needed, as the standard
Makefile puts the man pages in the proper location. Also, fix compile
warnings in a couple other files.

[YOCTO #9341]

(From OE-Core rev: 8b4dedebdbddaf352fd84503eee3dd545bbcea41)

Signed-off-by: Bill Randle <william.c.randle@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-31 23:01:37 +01:00
Bill Randle 437841c1fc man: fix src/Makefile to work with parallel make
The Makefile for man has a rule to create two generated targets with
a program run from the shell. Because the rule was run twice, with
parallel make, the generated files were being overwritten at the same
time they were being compiled. This patch forces the rule to be run
only once.

[YOCTO #9333]

(From OE-Core rev: 61f3ef6a209805577c0e731a73c4f0eab1ace748)

Signed-off-by: Bill Randle <william.c.randle@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-30 12:01:29 +01:00
Khem Raj f03b36b199 man: Use -DSYSV when builing for linux
We needed this define but were getting away since glibc indirectly
included fcntl.h but man sources clearly guard inclusion of fcntl.h with
SYSV, this is uncovered with musl

(From OE-Core rev: 34682843d0e2b645d33900ee425428a01e3f2ddc)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-12 22:48:38 +01:00
Yue Tao 44544fca58 man: replace ',' with '#'
Sometimes, the parameters of CC/BUILD_CC contains the ',', which
cause the sed command failed, so replace the ',' with '#'

(From OE-Core rev: b493467d77081becfc419dff817d28a171736924)

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-08 00:01:22 +01:00
Jian Liu 73be8c1825 man: fix bugs of makewhatis script
- man-1.6e-whatis2.patch does not delete the tail "fi"
  fix it to avoid syntax error
- Use the command "which" to get the path of awk

(From OE-Core rev: 9383f635858e35e8fb83fba1750a8c6e4b4274b1)

Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-09 15:57:59 +00:00
Robert Yang 77755375f9 man: fix SRC_URI
Fixed:
WARNING: Failed to fetch URL http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz, attempting MIRRORS if available

Its HOMEPAGE is also down, but can't find one for it.

(From OE-Core rev: 787f735c4f66fc498d86b468c862ceed25ed80de)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-03 14:53:52 +00:00
Robert Yang 8d8e035daa man: remove fakeroot from do_install()
The fakeroot is already set in base.bbclass.

(From OE-Core rev: 507eaacf6f3c44038c60fd312a42123dc945ff7b)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-16 23:08:23 +00:00
Hongxu Jia 0d90e61611 man/texinfo: conditionally add gzip/bzip2/xz to RDEPENDS
Conditionally add 'xz/bz2/gzip' to info/man's RDEPENDS
according to DOC_COMPRESS.

[YOCTO #6750]
[YOCTO #6751]

(From OE-Core rev: 610220a95f9ef78590acb1b8f18abc984464da96)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-09-29 12:12:45 +01:00
Hongxu Jia 78aeee1fce man: fix not support xz/bz2 compression
In oe-core, bunzip and unzx located in /usr/bin/
rather than /usr, so tweak man's config.

[YOCTO #6750]

(From OE-Core rev: a8f07626d627b49913835778cc8039accd8b9896)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-09-23 21:38:33 +01:00
Mark Hatle 13bf43f371 man: Remove wildcard from SRC_URI
[ CQID: WIND00402802 ]

Remove the wildcard from the SRC_URI.  This causes problems when you .bbappend
and add a FILESEXTRAPATHS entry.  The unpack task may be unable to find the
files to unpack leading to an error.

Avoid wildcards at all costs...

Note, remove both man-1.5m2-multiple.patch and man-1.6e-lzma+xz-support.patch,
they were not being applied in the previous version.  The later also fails to
apply when added to the SRC_URI.

(From OE-Core rev: 61b60906b2825d4f9ea1f5ae11e1f9fcc77ac4e7)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-22 06:09:23 -08:00
Saul Wold d0505b7c01 man: Update to 1.6g
Rebase some patches

(From OE-Core rev: 4cb22ea0beb952a5d70f83aaac415b7f2ecf3fd5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-19 17:55:03 +00:00
Koen Kooi 0547b66941 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: edff7ae2d2fbd9ccc69645f9f86f3b9d0a53cb23)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:42 +01:00
Koen Kooi 2d1f0cae65 man: fix RDEPENDS and reformat recipe
(From OE-Core rev: f50fc40f0382a6ddac6bdf602b4303fde998edbe)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:42 +01:00
Javier Martinez Canillas ed9fc6fa51 man: use ${sysconfdir} instead of /etc for packaging
It is considered good practice to use the build system provided
variables instead of directly specify hardcoded paths.

(From OE-Core rev: e044be34601dcc8eeca7f96d628964bebf562e2e)

Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:50 +01:00
Saul Wold 361d3b971a man: fix configure issue to solve warnings
WARNING: For recipe man, the following files/directories were installed but not shipped in any package:
WARNING:   /intel
WARNING:   /intel/poky
WARNING:   /intel/poky/builds
WARNING:   /intel/poky/builds/world
WARNING:   /intel/poky/builds/world/tmp
WARNING:   /intel/poky/builds/world/tmp/work
WARNING:   /intel/poky/builds/world/tmp/work/i586-poky-linux
WARNING:   /intel/poky/builds/world/tmp/work/i586-poky-linux/man-1.6f-r1
WARNING:   /intel/poky/builds/world/tmp/work/i586-poky-linux/man-1.6f-r1/image
WARNING:   /intel/poky/builds/world/tmp/work/i586-poky-linux/man-1.6f-r1/image/etc
WARNING:   /intel/poky/builds/world/tmp/work/i586-poky-linux/man-1.6f-r1/image/etc/man.config
(From OE-Core rev: d90eadccdb5a2f0fddc79dbdcec80b5f3f7908c8)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-14 13:03:12 +00:00
Saul Wold 8993a66eaa man: fix QA Packaging issues
(From OE-Core rev: 2f597288c141c910b945e63e8b31436984ad536b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-31 22:03:23 +00:00
Khem Raj a0dc330b4a recipes: Delete patch=1, its default and replace pnum with striplevel
Some place pnum=1 is used which is removed as well since
striplevel=1 is default

(From OE-Core rev: 4e108857e0d40105f7ecbc55e99bd6c367bb7386)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-23 18:23:30 -07:00
Scott Garman e47c1cfe71 man: add Upstream-Status field to paches
(From OE-Core rev: 69afe776afc20f4e46303d4f57b080d7c4a8542f)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-19 17:34:20 +01:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Richard Purdie 257a9edb4b Update SRC_URIs to use BPN instead of PN
[YOCTO #860]

(From OE-Core rev: 09ed5de9624be38c0fa5cb3f943691c3b4a50686)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-14 22:36:25 +00:00
Saul Wold 8494db7478 man: updated to 1.6f, fixed patches
Rebased patches for 1.6f:
  - lzma - modified for xz support
  - ro_usr & whatis2 fixed up

Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-30 12:06:52 +00:00
Mark Hatle f992d6b434 recipes-extended: Add Summary information
Add Summary information and update descriptions as necessary.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-12-16 15:53:08 +00:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Xiaofeng Yan 3f71edc3ef man: Add new man package
A set of documentation tools: man, apropos and whatis

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
2010-09-08 16:36:53 -07:00