diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-02-17 00:47:44 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-17 22:35:02 +0000 |
commit | a48168602e332090b49802531339b4f8104fb3ac (patch) | |
tree | 3a22c056281718ad341c68a7ba01270479aa1fc9 /meta/recipes-core | |
parent | 2ca0339b3969f9754bc7c4e69c49175c8c1287dc (diff) | |
download | poky-a48168602e332090b49802531339b4f8104fb3ac.tar.gz |
coreutils: don't generate useless dummy stub manpages
We had a couple patches to 1) deal with missing perl and 2) deal
with the perl-less "dummy" help2man fallout, but in the end, they
achieve no purpose whatsoever, since they just populate the doc
RPM with manpages like this one:
NAME
chmod - a GNU coreutils 8.22 program
DESCRIPTION
OOOPS! Due to the lack of perl on the build system, we were
unable to create a proper manual page for chmod.
As the above serves no purpose whatsoever, and since the concept
of running the binaries to capture the "--help" text output is
completely broken for cross compiles, lets just decouple man page
generation from the building of coreutils entirely so it paves the
way for importing pre-generated manpages.
(From OE-Core rev: cb2519466b4d28217ae955370077bc4a8f9b6dce)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
4 files changed, 28 insertions, 55 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.23/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.23/dummy_help2man.patch deleted file mode 100644 index 4757f52aa0..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.23/dummy_help2man.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk | ||
5 | --- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200 | ||
6 | +++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200 | ||
7 | @@ -19,11 +19,11 @@ | ||
8 | EXTRA_DIST += man/help2man man/dummy-man | ||
9 | |||
10 | ## Graceful degradation for systems lacking perl. | ||
11 | -if HAVE_PERL | ||
12 | -run_help2man = $(PERL) -- $(srcdir)/man/help2man | ||
13 | -else | ||
14 | +#if HAVE_PERL | ||
15 | +#run_help2man = $(PERL) -- $(srcdir)/man/help2man | ||
16 | +#else | ||
17 | run_help2man = $(SHELL) $(srcdir)/man/dummy-man | ||
18 | -endif | ||
19 | +#endif | ||
20 | |||
21 | man1_MANS = @man1_MANS@ | ||
22 | EXTRA_DIST += $(man1_MANS:.1=.x) | ||
diff --git a/meta/recipes-core/coreutils/coreutils-8.23/fix-for-dummy-man-usage.patch b/meta/recipes-core/coreutils/coreutils-8.23/fix-for-dummy-man-usage.patch deleted file mode 100644 index 58b6a76130..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.23/fix-for-dummy-man-usage.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | coreutils: fix for dummy-man usage | ||
4 | |||
5 | The options should be before the final argument, otherwise, the following error | ||
6 | would appear when compiling. | ||
7 | |||
8 | "dummy-man: too many non-option arguments" | ||
9 | |||
10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
11 | --- | ||
12 | man/local.mk | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/man/local.mk b/man/local.mk | ||
16 | index ba8fbf7..3833458 100644 | ||
17 | --- a/man/local.mk | ||
18 | +++ b/man/local.mk | ||
19 | @@ -101,8 +101,8 @@ man/dynamic-deps.mk: Makefile | ||
20 | && $(run_help2man) \ | ||
21 | --source='$(PACKAGE_STRING)' \ | ||
22 | --include=$(srcdir)/man/$$name.x \ | ||
23 | - --output=$$t/$$name.1 $$t/$$argv \ | ||
24 | --info-page='coreutils \(aq'$$name' invocation\(aq' \ | ||
25 | + --output=$$t/$$name.1 $$t/$$argv \ | ||
26 | && sed \ | ||
27 | -e 's|$*\.td/||g' \ | ||
28 | -e '/For complete documentation/d' \ | ||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch b/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch new file mode 100644 index 0000000000..3c896a11bf --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From b4d258629f090066783c3b4c91b40f63b9d0a296 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
3 | Date: Sun, 8 Feb 2015 16:51:57 -0500 | ||
4 | Subject: [PATCH] man: decouple manpages from build | ||
5 | |||
6 | The use of "help2man" doesn't work at all for cross compile, in | ||
7 | addition to the extra requirement of perl it adds. | ||
8 | |||
9 | Just decouple the manpages from the build in order to pave the way for | ||
10 | importing prebuilt manpages that can be used in a cross build situation. | ||
11 | |||
12 | Upstream-Status: Inappropriate [upstream doesn't care about x-compile case.] | ||
13 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
14 | |||
15 | diff --git a/Makefile.am b/Makefile.am | ||
16 | index fb4af27..7576b2c 100644 | ||
17 | --- a/Makefile.am | ||
18 | +++ b/Makefile.am | ||
19 | @@ -214,5 +214,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src | ||
20 | include $(top_srcdir)/lib/local.mk | ||
21 | include $(top_srcdir)/src/local.mk | ||
22 | include $(top_srcdir)/doc/local.mk | ||
23 | -include $(top_srcdir)/man/local.mk | ||
24 | include $(top_srcdir)/tests/local.mk | ||
25 | -- | ||
26 | 2.2.2 | ||
27 | |||
diff --git a/meta/recipes-core/coreutils/coreutils_8.23.bb b/meta/recipes-core/coreutils/coreutils_8.23.bb index e9d6494708..be68a31031 100644 --- a/meta/recipes-core/coreutils/coreutils_8.23.bb +++ b/meta/recipes-core/coreutils/coreutils_8.23.bb | |||
@@ -13,9 +13,8 @@ DEPENDS_class-native = "" | |||
13 | inherit autotools gettext texinfo | 13 | inherit autotools gettext texinfo |
14 | 14 | ||
15 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ | 15 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ |
16 | file://man-decouple-manpages-from-build.patch \ | ||
16 | file://remove-usr-local-lib-from-m4.patch \ | 17 | file://remove-usr-local-lib-from-m4.patch \ |
17 | file://dummy_help2man.patch \ | ||
18 | file://fix-for-dummy-man-usage.patch \ | ||
19 | file://fix-selinux-flask.patch \ | 18 | file://fix-selinux-flask.patch \ |
20 | " | 19 | " |
21 | 20 | ||