diff options
| -rw-r--r-- | meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub-efi-native_2.00.bb | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch b/meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch new file mode 100644 index 0000000000..70f60015c2 --- /dev/null +++ b/meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From f66d54b934710f54999debb72e8b7c620edece1d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Jones <pjones@redhat.com> | ||
| 3 | Date: Fri, 25 May 2012 15:28:19 -0400 | ||
| 4 | Subject: [PATCH] gnulib accused in build breaking shocker. | ||
| 5 | |||
| 6 | Upstream-Status: pending [Fedora will push this] | ||
| 7 | |||
| 8 | --- | ||
| 9 | grub-core/gnulib/stdio.in.h | 2 ++ | ||
| 10 | 1 file changed, 2 insertions(+) | ||
| 11 | |||
| 12 | diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h | ||
| 13 | index 80b9dbf..69932d9 100644 | ||
| 14 | --- a/grub-core/gnulib/stdio.in.h | ||
| 15 | +++ b/grub-core/gnulib/stdio.in.h | ||
| 16 | @@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " | ||
| 17 | so any use of gets warrants an unconditional warning. Assume it is | ||
| 18 | always declared, since it is required by C89. */ | ||
| 19 | #undef gets | ||
| 20 | +#if 0 | ||
| 21 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
| 22 | +#endif | ||
| 23 | |||
| 24 | #if @GNULIB_FOPEN@ | ||
| 25 | # if @REPLACE_FOPEN@ | ||
| 26 | -- | ||
| 27 | 1.7.10.1 | ||
| 28 | |||
diff --git a/meta/recipes-bsp/grub/grub-efi-native_2.00.bb b/meta/recipes-bsp/grub/grub-efi-native_2.00.bb index 6f8ba8e84f..2a5dad7104 100644 --- a/meta/recipes-bsp/grub/grub-efi-native_2.00.bb +++ b/meta/recipes-bsp/grub/grub-efi-native_2.00.bb | |||
| @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
| 16 | # FIXME: We should be able to optionally drop freetype as a dependency | 16 | # FIXME: We should be able to optionally drop freetype as a dependency |
| 17 | DEPENDS = "autogen-native" | 17 | DEPENDS = "autogen-native" |
| 18 | RDEPENDS_${PN} = "diffutils freetype" | 18 | RDEPENDS_${PN} = "diffutils freetype" |
| 19 | PR = "r1" | 19 | PR = "r2" |
| 20 | 20 | ||
| 21 | # Native packages do not normally rebuild when the target changes. | 21 | # Native packages do not normally rebuild when the target changes. |
| 22 | # Ensure this is built once per HOST-TARGET pair. | 22 | # Ensure this is built once per HOST-TARGET pair. |
| @@ -28,6 +28,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ | |||
| 28 | file://grub-2.00-disable-help2man.patch \ | 28 | file://grub-2.00-disable-help2man.patch \ |
| 29 | file://check-if-liblzma-is-disabled.patch \ | 29 | file://check-if-liblzma-is-disabled.patch \ |
| 30 | file://grub-no-unused-result.patch \ | 30 | file://grub-no-unused-result.patch \ |
| 31 | file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ | ||
| 31 | " | 32 | " |
| 32 | SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" | 33 | SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" |
| 33 | SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" | 34 | SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" |
