From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Cc: Paul Eggleton <paul.eggleton@linux.intel.com>
Subject: [PATCH 1/3] coreutils: don't generate useless dummy stub manpages
Date: Tue, 10 Feb 2015 14:19:04 -0500 [thread overview]
Message-ID: <1423595946-25011-2-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1423595946-25011-1-git-send-email-paul.gortmaker@windriver.com>
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.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
.../coreutils/coreutils-8.23/dummy_help2man.patch | 22 ---------------
.../coreutils-8.23/fix-for-dummy-man-usage.patch | 31 ----------------------
.../man-decouple-manpages-from-build.patch | 27 +++++++++++++++++++
meta/recipes-core/coreutils/coreutils_8.23.bb | 3 +--
4 files changed, 28 insertions(+), 55 deletions(-)
delete mode 100644 meta/recipes-core/coreutils/coreutils-8.23/dummy_help2man.patch
delete mode 100644 meta/recipes-core/coreutils/coreutils-8.23/fix-for-dummy-man-usage.patch
create mode 100644 meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch
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 4757f52aa0be..000000000000
--- a/meta/recipes-core/coreutils/coreutils-8.23/dummy_help2man.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk
---- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200
-+++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200
-@@ -19,11 +19,11 @@
- EXTRA_DIST += man/help2man man/dummy-man
-
- ## Graceful degradation for systems lacking perl.
--if HAVE_PERL
--run_help2man = $(PERL) -- $(srcdir)/man/help2man
--else
-+#if HAVE_PERL
-+#run_help2man = $(PERL) -- $(srcdir)/man/help2man
-+#else
- run_help2man = $(SHELL) $(srcdir)/man/dummy-man
--endif
-+#endif
-
- man1_MANS = @man1_MANS@
- 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 58b6a7613038..000000000000
--- a/meta/recipes-core/coreutils/coreutils-8.23/fix-for-dummy-man-usage.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Pending
-
-coreutils: fix for dummy-man usage
-
-The options should be before the final argument, otherwise, the following error
-would appear when compiling.
-
-"dummy-man: too many non-option arguments"
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- man/local.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/local.mk b/man/local.mk
-index ba8fbf7..3833458 100644
---- a/man/local.mk
-+++ b/man/local.mk
-@@ -101,8 +101,8 @@ man/dynamic-deps.mk: Makefile
- && $(run_help2man) \
- --source='$(PACKAGE_STRING)' \
- --include=$(srcdir)/man/$$name.x \
-- --output=$$t/$$name.1 $$t/$$argv \
- --info-page='coreutils \(aq'$$name' invocation\(aq' \
-+ --output=$$t/$$name.1 $$t/$$argv \
- && sed \
- -e 's|$*\.td/||g' \
- -e '/For complete documentation/d' \
---
-1.9.1
-
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 000000000000..3c896a11bf2d
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch
@@ -0,0 +1,27 @@
+From b4d258629f090066783c3b4c91b40f63b9d0a296 Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Sun, 8 Feb 2015 16:51:57 -0500
+Subject: [PATCH] man: decouple manpages from build
+
+The use of "help2man" doesn't work at all for cross compile, in
+addition to the extra requirement of perl it adds.
+
+Just decouple the manpages from the build in order to pave the way for
+importing prebuilt manpages that can be used in a cross build situation.
+
+Upstream-Status: Inappropriate [upstream doesn't care about x-compile case.]
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+
+diff --git a/Makefile.am b/Makefile.am
+index fb4af27..7576b2c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -214,5 +214,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src
+ include $(top_srcdir)/lib/local.mk
+ include $(top_srcdir)/src/local.mk
+ include $(top_srcdir)/doc/local.mk
+-include $(top_srcdir)/man/local.mk
+ include $(top_srcdir)/tests/local.mk
+--
+2.2.2
+
diff --git a/meta/recipes-core/coreutils/coreutils_8.23.bb b/meta/recipes-core/coreutils/coreutils_8.23.bb
index e9d6494708de..be68a310311a 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 = ""
inherit autotools gettext texinfo
SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
+ file://man-decouple-manpages-from-build.patch \
file://remove-usr-local-lib-from-m4.patch \
- file://dummy_help2man.patch \
- file://fix-for-dummy-man-usage.patch \
file://fix-selinux-flask.patch \
"
--
2.2.1
next prev parent reply other threads:[~2015-02-10 19:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-10 19:19 [PATCH 0/3] coreutils: facilitate generating real manpages Paul Gortmaker
2015-02-10 19:19 ` Paul Gortmaker [this message]
2015-02-11 1:51 ` [PATCH 1/3] coreutils: don't generate useless dummy stub manpages ChenQi
2015-02-17 5:43 ` Paul Gortmaker
2015-02-10 19:19 ` [PATCH 2/3] coreutils: import prebuilt manpages from Gentoo Paul Gortmaker
2015-02-10 19:59 ` Mark Hatle
2015-02-10 19:19 ` [PATCH 3/3] scripts: delete dummy help2man script Paul Gortmaker
-- strict thread matches above, loose matches on Subject: below --
2015-02-17 5:47 [PATCH-v2 0/3] coreutils: facilitate generating real manpages Paul Gortmaker
2015-02-17 5:47 ` [PATCH 1/3] coreutils: don't generate useless dummy stub manpages Paul Gortmaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423595946-25011-2-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=paul.eggleton@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox