From c25c83dd897d9b20e4f8793ac50d4ee3802454af Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 18 Apr 2013 17:10:20 +0200 Subject: grub-efi-native: fix build on modern distributions without gets() O irony: the grub2/gnulib nag macro that says "don't use gets, use fgets" breaks the build if you're using a recent (e)glibc release that has gets removed. Fedora already #if 0's the check in grub, so I stole their patch. (From OE-Core rev: 261e377b08388a288ee521a3629877b89e18e42b) (From OE-Core rev: 0785489d558c34cacf5cb349949a15e27084efbf) Signed-off-by: Koen Kooi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../grub-2.00-ignore-gnulib-gets-stupidity.patch | 28 ++++++++++++++++++++++ meta/recipes-bsp/grub/grub-efi-native_2.00.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch 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 @@ +From f66d54b934710f54999debb72e8b7c620edece1d Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 25 May 2012 15:28:19 -0400 +Subject: [PATCH] gnulib accused in build breaking shocker. + +Upstream-Status: pending [Fedora will push this] + +--- + grub-core/gnulib/stdio.in.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h +index 80b9dbf..69932d9 100644 +--- a/grub-core/gnulib/stdio.in.h ++++ b/grub-core/gnulib/stdio.in.h +@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets ++#if 0 + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ +-- +1.7.10.1 + 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 14ab9ea7b9..b7b92cb4d2 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" # FIXME: We should be able to optionally drop freetype as a dependency DEPENDS = "autogen-native" RDEPENDS_${PN} = "diffutils freetype" -PR = "r1" +PR = "r2" # Native packages do not normally rebuild when the target changes. # 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 \ file://grub-2.00-disable-help2man.patch \ file://check-if-liblzma-is-disabled.patch \ file://grub-no-unused-result.patch \ + file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ " SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" -- cgit v1.2.3-54-g00ecf