diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-03-18 14:40:32 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 22:57:58 +0000 |
| commit | f59263a2d1a4918e8dd12fcf968a826b3e8fa018 (patch) | |
| tree | 59959d9da9f1960166f6f163c1fdda3bb81da569 | |
| parent | 28c1cffacf341ad64a5b68d8a0176f92b49135c0 (diff) | |
| download | openembedded-core-f59263a2d1a4918e8dd12fcf968a826b3e8fa018.tar.gz openembedded-core-f59263a2d1a4918e8dd12fcf968a826b3e8fa018.tar.bz2 openembedded-core-f59263a2d1a4918e8dd12fcf968a826b3e8fa018.zip | |
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 ]
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-bsp/grub/files/fix-texinfo.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
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 @@ +The tarball has a texi file that doesn't parse with current texinfo, so if it's +being re-generated the build will fail. Take a patch from upstream to fix the +texi. + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From d4c4b8e1a085f92afcec36f6e590c6dfc51d0a1c Mon Sep 17 00:00:00 2001 +From: Bryan Hundven <bryanhundven@gmail.com> +Date: Mon, 08 Apr 2013 13:23:07 +0000 +Subject: * docs/grub-dev.texi: Move @itemize after @subsection to satisfy + + texinfo-5.1. +--- +(limited to 'docs/grub-dev.texi') + +diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi +index a4a3820..f74c966 100644 +--- a/docs/grub-dev.texi ++++ b/docs/grub-dev.texi +@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0, 0); + + @node Bitmap API + @section Bitmap API +-@itemize + @subsection grub_video_bitmap_create ++@itemize + @item Prototype: + @example + 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) +-- +cgit 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 \ file://grub2-fix-initrd-size-bug.patch \ file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \ file://0001-Remove-direct-_llseek-code-and-require-long-filesyst.patch \ + file://fix-texinfo.patch \ " DEPENDS = "flex-native bison-native" |