From 60f845774d62b76c09602df299cef922edfea3c4 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sat, 3 Aug 2013 17:04:00 -0700 Subject: grub-efi-native: add flex patch to efi-native version also Signed-off-by: Saul Wold --- .../grub/files/fix-issue-with-flex-2.5.37.patch | 21 +++++++++++++++++++++ .../grub/grub-2.00/fix-issue-with-flex-2.5.37.patch | 21 --------------------- meta/recipes-bsp/grub/grub-efi-native_2.00.bb | 1 + 3 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-bsp/grub/files/fix-issue-with-flex-2.5.37.patch delete mode 100644 meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/grub/files/fix-issue-with-flex-2.5.37.patch b/meta/recipes-bsp/grub/files/fix-issue-with-flex-2.5.37.patch new file mode 100644 index 0000000000..61ae2f5372 --- /dev/null +++ b/meta/recipes-bsp/grub/files/fix-issue-with-flex-2.5.37.patch @@ -0,0 +1,21 @@ +Upstream-Status: Backport + +This fixes compilation issues when using flex-2.5.37. It was taken from upstream. + +Original author is: Vladimir Serbinenko + +Signed-off-by: Laurentiu Palcu + +Index: grub-2.00/grub-core/script/yylex.l +=================================================================== +--- grub-2.00.orig/grub-core/script/yylex.l 2012-06-08 23:24:15.000000000 +0300 ++++ grub-2.00/grub-core/script/yylex.l 2013-07-31 14:34:40.708100982 +0300 +@@ -29,6 +29,8 @@ + #pragma GCC diagnostic ignored "-Wmissing-prototypes" + #pragma GCC diagnostic ignored "-Wmissing-declarations" + #pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations" ++#pragma GCC diagnostic ignored "-Wunused-function" ++#pragma GCC diagnostic ignored "-Wsign-compare" + + #define yyfree grub_lexer_yyfree + #define yyalloc grub_lexer_yyalloc diff --git a/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch b/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch deleted file mode 100644 index 61ae2f5372..0000000000 --- a/meta/recipes-bsp/grub/grub-2.00/fix-issue-with-flex-2.5.37.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Backport - -This fixes compilation issues when using flex-2.5.37. It was taken from upstream. - -Original author is: Vladimir Serbinenko - -Signed-off-by: Laurentiu Palcu - -Index: grub-2.00/grub-core/script/yylex.l -=================================================================== ---- grub-2.00.orig/grub-core/script/yylex.l 2012-06-08 23:24:15.000000000 +0300 -+++ grub-2.00/grub-core/script/yylex.l 2013-07-31 14:34:40.708100982 +0300 -@@ -29,6 +29,8 @@ - #pragma GCC diagnostic ignored "-Wmissing-prototypes" - #pragma GCC diagnostic ignored "-Wmissing-declarations" - #pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations" -+#pragma GCC diagnostic ignored "-Wunused-function" -+#pragma GCC diagnostic ignored "-Wsign-compare" - - #define yyfree grub_lexer_yyfree - #define yyalloc grub_lexer_yyalloc 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 11dcfdf07e..2d3d68a9b8 100644 --- a/meta/recipes-bsp/grub/grub-efi-native_2.00.bb +++ b/meta/recipes-bsp/grub/grub-efi-native_2.00.bb @@ -29,6 +29,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://check-if-liblzma-is-disabled.patch \ file://grub-no-unused-result.patch \ file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ + file://fix-issue-with-flex-2.5.37.patch \ " SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" -- cgit 1.2.3-korg