diff options
author | Joe MacDonald <joe@deserted.net> | 2013-08-12 09:00:00 -0400 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2013-08-12 09:00:00 -0400 |
commit | 5c3e27684cf2ef187b2c99d7f84ea7b367061e70 (patch) | |
tree | 5f90d7aa82b32a7979b74d64aa32e880e3717850 /meta-networking | |
parent | 7912bd2479b8d166b8a0347f8ff29c9be588a1f7 (diff) | |
download | meta-openembedded-5c3e27684cf2ef187b2c99d7f84ea7b367061e70.tar.gz |
quagga: backport documentation patch
The latest stable quagga adopted this patch:
http://git.savannah.gnu.org/gitweb/?p=quagga.git;a=commit;h=b58c90807c9d0bfa9601704c7490a16070906004
to repair a documentation build error. Trivial backport.
Signed-off-by: Joe MacDonald <joe@deserted.net>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-protocols/quagga/files/0001-doc-fix-makeinfo-errors-and-one-warning.patch | 61 | ||||
-rw-r--r-- | meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb | 2 |
2 files changed, 63 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/quagga/files/0001-doc-fix-makeinfo-errors-and-one-warning.patch b/meta-networking/recipes-protocols/quagga/files/0001-doc-fix-makeinfo-errors-and-one-warning.patch new file mode 100644 index 000000000..24fdac505 --- /dev/null +++ b/meta-networking/recipes-protocols/quagga/files/0001-doc-fix-makeinfo-errors-and-one-warning.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From d6cbd8bbc34529a1aff74b5ee73366b89526c961 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe MacDonald <joe@deserted.net> | ||
3 | Date: Fri, 22 Mar 2013 08:54:44 +0000 | ||
4 | Subject: [PATCH] doc: fix makeinfo errors and one warning | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | commit 4afa50b added few lines that are syntactically incorrect | ||
10 | with leading plus sign. | ||
11 | |||
12 | Upstream-Status: Backport [http://git.savannah.gnu.org/gitweb/?p=quagga.git;a=commit;h=b58c90807c9d0bfa9601704c7490a16070906004] | ||
13 | |||
14 | Cc: Denis Ovsienko <infrastation@yandex.ru> | ||
15 | Signed-off-by: Timo Teräs <timo.teras@iki.fi> | ||
16 | Signed-off-by: David Lamparter <equinox@opensourcerouting.org> | ||
17 | Signed-off-by: Joe MacDonald <joe@deserted.net> | ||
18 | --- | ||
19 | doc/ipv6.texi | 4 ++-- | ||
20 | doc/quagga.texi | 6 +++--- | ||
21 | 2 files changed, 5 insertions(+), 5 deletions(-) | ||
22 | |||
23 | diff --git a/doc/ipv6.texi b/doc/ipv6.texi | ||
24 | index b6cc437..2482c1c 100644 | ||
25 | --- a/doc/ipv6.texi | ||
26 | +++ b/doc/ipv6.texi | ||
27 | @@ -136,8 +136,8 @@ for the lowest preference possible. | ||
28 | Default: 0 | ||
29 | @end deffn | ||
30 | |||
31 | -+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} | ||
32 | -+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} | ||
33 | +@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} | ||
34 | +@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} | ||
35 | The value to be placed in Home Agent Option, when Home Agent config flag is set, | ||
36 | which indicates to hosts Home Agent Lifetime. The default value of 0 means to | ||
37 | place the current Router Lifetime value. | ||
38 | diff --git a/doc/quagga.texi b/doc/quagga.texi | ||
39 | index ff913aa..b4105ac 100644 | ||
40 | --- a/doc/quagga.texi | ||
41 | +++ b/doc/quagga.texi | ||
42 | @@ -1,13 +1,13 @@ | ||
43 | \input texinfo @c -*- texinfo -*- | ||
44 | +@c Set variables - sourced from defines.texi | ||
45 | +@include defines.texi | ||
46 | + | ||
47 | @c %**start of header | ||
48 | @setchapternewpage odd | ||
49 | @settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}} | ||
50 | @setfilename quagga.info | ||
51 | @c %**end of header | ||
52 | |||
53 | -@c Set variables - sourced from defines.texi | ||
54 | -@include defines.texi | ||
55 | - | ||
56 | @c automake will automatically generate version.texi | ||
57 | @c and set EDITION, VERSION, UPDATED and UPDATED-MONTH | ||
58 | @include version.texi | ||
59 | -- | ||
60 | 1.7.10.4 | ||
61 | |||
diff --git a/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb b/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb index 5c403a969..2b4693007 100644 --- a/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb +++ b/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb | |||
@@ -2,6 +2,8 @@ require quagga.inc | |||
2 | 2 | ||
3 | PR = "${INC_PR}.0" | 3 | PR = "${INC_PR}.0" |
4 | 4 | ||
5 | SRC_URI += "file://0001-doc-fix-makeinfo-errors-and-one-warning.patch" | ||
6 | |||
5 | SRC_URI[quagga-0.99.21.md5sum] = "99840adbe57047c90dfba6b6ed9aec7f" | 7 | SRC_URI[quagga-0.99.21.md5sum] = "99840adbe57047c90dfba6b6ed9aec7f" |
6 | SRC_URI[quagga-0.99.21.sha256sum] = "9b8aea9026b4771a28e254a66cbd854723bcd0d71eebd0201d11838d4eb392ee" | 8 | SRC_URI[quagga-0.99.21.sha256sum] = "9b8aea9026b4771a28e254a66cbd854723bcd0d71eebd0201d11838d4eb392ee" |
7 | 9 | ||