summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-03-18 14:40:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:29 +0000
commita7dd04d15b0208c5d159abb7b40079c62aa60d78 (patch)
tree2409cea4b10a530205e55794b44b614cb53cef65
parentee4f61b7e14a108d26eadc5e5b285e8d99c94545 (diff)
downloadpoky-a7dd04d15b0208c5d159abb7b40079c62aa60d78.tar.gz
grub: fix documentation rebuilds
If the documentation needs to rebuild then it will fail as the syntax isn't valid with modern texinfo. Backport a patch from git to fix the syntax. [ YOCTO #9306 ] (From OE-Core rev: f59263a2d1a4918e8dd12fcf968a826b3e8fa018) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/files/fix-texinfo.patch32
-rw-r--r--meta/recipes-bsp/grub/grub2.inc1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/fix-texinfo.patch b/meta/recipes-bsp/grub/files/fix-texinfo.patch
new file mode 100644
index 0000000000..b911d7370b
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/fix-texinfo.patch
@@ -0,0 +1,32 @@
1The tarball has a texi file that doesn't parse with current texinfo, so if it's
2being re-generated the build will fail. Take a patch from upstream to fix the
3texi.
4
5Upstream-Status: Backport
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8From d4c4b8e1a085f92afcec36f6e590c6dfc51d0a1c Mon Sep 17 00:00:00 2001
9From: Bryan Hundven <bryanhundven@gmail.com>
10Date: Mon, 08 Apr 2013 13:23:07 +0000
11Subject: * docs/grub-dev.texi: Move @itemize after @subsection to satisfy
12
13 texinfo-5.1.
14---
15(limited to 'docs/grub-dev.texi')
16
17diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
18index a4a3820..f74c966 100644
19--- a/docs/grub-dev.texi
20+++ b/docs/grub-dev.texi
21@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0, 0);
22
23 @node Bitmap API
24 @section Bitmap API
25-@itemize
26 @subsection grub_video_bitmap_create
27+@itemize
28 @item Prototype:
29 @example
30 grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)
31--
32cgit v0.9.0.2
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 12cff4f507..146dde60c0 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -29,6 +29,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
29 file://grub2-fix-initrd-size-bug.patch \ 29 file://grub2-fix-initrd-size-bug.patch \
30 file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \ 30 file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \
31 file://0001-Remove-direct-_llseek-code-and-require-long-filesyst.patch \ 31 file://0001-Remove-direct-_llseek-code-and-require-long-filesyst.patch \
32 file://fix-texinfo.patch \
32 " 33 "
33 34
34DEPENDS = "flex-native bison-native" 35DEPENDS = "flex-native bison-native"