summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-09-17 17:28:04 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-22 12:19:34 +0100
commited81641386ab83a5e780a64a5176d3000a70ae78 (patch)
treeac0fdaee7f002a46f0dc7cb05cd17fa3e6a39a9e
parent10c85f54e524ab3cac0c3b236ff9e2ec677de086 (diff)
downloadpoky-ed81641386ab83a5e780a64a5176d3000a70ae78.tar.gz
findutils_4.2.31: backport fixes for doc build errors
[YOCTO #5212] (From OE-Core rev: cb41aff1ac343b4fa8b4c9d43cc38652f7593ee6) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/findutils/findutils-4.2.31/findutils-fix-doc-build-error.patch53
-rw-r--r--meta/recipes-extended/findutils/findutils_4.2.31.bb1
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-extended/findutils/findutils-4.2.31/findutils-fix-doc-build-error.patch b/meta/recipes-extended/findutils/findutils-4.2.31/findutils-fix-doc-build-error.patch
new file mode 100644
index 0000000000..2076e44097
--- /dev/null
+++ b/meta/recipes-extended/findutils/findutils-4.2.31/findutils-fix-doc-build-error.patch
@@ -0,0 +1,53 @@
1From 33cba24cba7b0973a702e9627bd5b93962948ae4 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Tue, 17 Sep 2013 16:11:16 +0800
4Subject: [PATCH] findutils: fix doc build error
5
6Upstream-Status: Backport
7
8Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
9---
10 doc/find.texi | 6 +++---
11 1 files changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/doc/find.texi b/doc/find.texi
14index 5b5f0cf..b3d9c6b 100644
15--- a/doc/find.texi
16+++ b/doc/find.texi
17@@ -63,7 +63,7 @@ translation approved by the Foundation.
18
19 @page
20 @vskip 0pt plus 1filll
21-@insertcopying{}
22+@insertcopying
23 @end titlepage
24
25 @contents
26@@ -1466,6 +1466,7 @@ no output is ever sent to it.
27 * Escapes::
28 * Format Directives::
29 * Time Formats::
30+* Formatting Flags::
31 @end menu
32
33 @node Escapes
34@@ -1534,7 +1535,6 @@ from the novel you are reading.
35 * Size Directives::
36 * Location Directives::
37 * Time Directives::
38-* Formatting Flags::
39 @end menu
40
41 @node Name Directives
42@@ -1780,7 +1780,7 @@ setting the TZ environment variable). This is a GNU extension.
43 @end table
44
45 @node Formatting Flags
46-@subsubsection Formatting Flags
47+@subsection Formatting Flags
48
49 The @samp{%m} and @samp{%d} directives support the @samp{#}, @samp{0}
50 and @samp{+} flags, but the other directives do not, even if they
51--
521.7.4.1
53
diff --git a/meta/recipes-extended/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb
index 00c3f77f10..72b657a100 100644
--- a/meta/recipes-extended/findutils/findutils_4.2.31.bb
+++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb
@@ -6,6 +6,7 @@ require findutils.inc
6 6
7SRC_URI += "file://gnulib-extension.patch \ 7SRC_URI += "file://gnulib-extension.patch \
8 file://findutils_fix_for_automake-1.12.patch \ 8 file://findutils_fix_for_automake-1.12.patch \
9 file://findutils-fix-doc-build-error.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a" 12SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a"