summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch (renamed from meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch)117
-rw-r--r--meta/recipes-bsp/grub/files/grub-2.00-fix-enable_execute_stack-check.patch (renamed from meta/recipes-bsp/grub/files/grub-1.99-fix-enable_execute_stack-check.patch)8
-rw-r--r--meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch (renamed from meta/recipes-bsp/grub/files/grub-1.99-fpmath-sse-387-fix.patch)0
-rw-r--r--meta/recipes-bsp/grub/files/grub-no-unused-result.patch18
-rw-r--r--meta/recipes-bsp/grub/grub-efi-native_2.00.bb (renamed from meta/recipes-bsp/grub/grub-efi-native_1.99.bb)18
-rw-r--r--meta/recipes-bsp/grub/grub_2.00.bb2
6 files changed, 47 insertions, 116 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch b/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
index 3ffefdcf35..a2e42c2b7f 100644
--- a/meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch
+++ b/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
@@ -10,14 +10,14 @@ unnecessarily.
10 10
11Signed-off-by: Darren Hart <dvhart@linux.intel.com> 11Signed-off-by: Darren Hart <dvhart@linux.intel.com>
12 12
13Index: grub-1.99/configure.ac 13Index: grub-2.00/configure.ac
14=================================================================== 14===================================================================
15--- grub-1.99.orig/configure.ac 15--- grub-2.00.orig/configure.ac
16+++ grub-1.99/configure.ac 16+++ grub-2.00/configure.ac
17@@ -275,11 +275,12 @@ if test x$grub_cv_apple_cc = xyes ; then 17@@ -310,11 +310,12 @@ if test x$USE_NLS = xno; then
18 HOST_CFLAGS="$HOST_CFLAGS -fnested-functions" 18 HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
19 fi 19 fi
20 20
21-if test "x$cross_compiling" = xyes; then 21-if test "x$cross_compiling" = xyes; then
22- AC_MSG_WARN([cannot generate manual pages while cross compiling]) 22- AC_MSG_WARN([cannot generate manual pages while cross compiling])
23-else 23-else
@@ -32,11 +32,11 @@ Index: grub-1.99/configure.ac
32 32
33 # Check for functions and headers. 33 # Check for functions and headers.
34 AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getextmntent) 34 AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getextmntent)
35Index: grub-1.99/configure 35Index: grub-2.00/configure
36=================================================================== 36===================================================================
37--- grub-1.99.orig/configure 37--- grub-2.00.orig/configure
38+++ grub-1.99/configure 38+++ grub-2.00/configure
39@@ -1172,7 +1172,6 @@ GL_COND_LIBTOOL_FALSE 39@@ -1215,7 +1215,6 @@ GL_COND_LIBTOOL_FALSE
40 GL_COND_LIBTOOL_TRUE 40 GL_COND_LIBTOOL_TRUE
41 BUILD_CC 41 BUILD_CC
42 LIBUTIL 42 LIBUTIL
@@ -44,15 +44,7 @@ Index: grub-1.99/configure
44 POSUB 44 POSUB
45 LTLIBINTL 45 LTLIBINTL
46 LIBINTL 46 LIBINTL
47@@ -1204,6 +1203,7 @@ LEXLIB 47@@ -3069,7 +3068,6 @@ _ACEOF
48 am__fastdepCC_FALSE
49 am__fastdepCC_TRUE
50 CCDEPMODE
51+am__nodep
52 AMDEPBACKSLASH
53 AMDEP_FALSE
54 AMDEP_TRUE
55@@ -3011,7 +3011,6 @@ _ACEOF
56 # Let the site file select an alternate cache file if it wants to. 48 # Let the site file select an alternate cache file if it wants to.
57 # Prefer an explicitly selected file to automatically selected ones. 49 # Prefer an explicitly selected file to automatically selected ones.
58 ac_site_file1=NONE 50 ac_site_file1=NONE
@@ -60,7 +52,7 @@ Index: grub-1.99/configure
60 if test -n "$CONFIG_SITE"; then 52 if test -n "$CONFIG_SITE"; then
61 # We do not want a PATH search for config.site. 53 # We do not want a PATH search for config.site.
62 case $CONFIG_SITE in #(( 54 case $CONFIG_SITE in #((
63@@ -3019,14 +3018,8 @@ if test -n "$CONFIG_SITE"; then 55@@ -3077,14 +3075,8 @@ if test -n "$CONFIG_SITE"; then
64 */*) ac_site_file1=$CONFIG_SITE;; 56 */*) ac_site_file1=$CONFIG_SITE;;
65 *) ac_site_file1=./$CONFIG_SITE;; 57 *) ac_site_file1=./$CONFIG_SITE;;
66 esac 58 esac
@@ -76,7 +68,7 @@ Index: grub-1.99/configure
76 do 68 do
77 test "x$ac_site_file" = xNONE && continue 69 test "x$ac_site_file" = xNONE && continue
78 if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then 70 if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
79@@ -3313,8 +3306,9 @@ case $target_os in *\ *) target_os=`echo 71@@ -3371,8 +3363,9 @@ case $target_os in *\ *) target_os=`echo
80 # The aliases save the names the user supplied, while $host etc. 72 # The aliases save the names the user supplied, while $host etc.
81 # will get canonicalized. 73 # will get canonicalized.
82 test -n "$target_alias" && 74 test -n "$target_alias" &&
@@ -88,83 +80,8 @@ Index: grub-1.99/configure
88 program_prefix=${target_alias}- 80 program_prefix=${target_alias}-
89 81
90 am__api_version='1.11' 82 am__api_version='1.11'
91@@ -3786,11 +3780,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma 83@@ -9633,51 +9626,13 @@ if test x$USE_NLS = xno; then
92 84 HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
93 # We need awk for the "check" target. The system "awk" is bad on
94 # some platforms.
95-# Always define AMTAR for backward compatibility.
96-
97-AMTAR=${AMTAR-"${am_missing_run}tar"}
98+# Always define AMTAR for backward compatibility. Yes, it's still used
99+# in the wild :-( We should find a proper way to deprecate it ...
100+AMTAR='$${TAR-tar}'
101
102-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
103+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
104
105
106
107@@ -4256,6 +4250,7 @@ fi
108 if test "x$enable_dependency_tracking" != xno; then
109 am_depcomp="$ac_aux_dir/depcomp"
110 AMDEPBACKSLASH='\'
111+ am__nodep='_no'
112 fi
113 if test "x$enable_dependency_tracking" != xno; then
114 AMDEP_TRUE=
115@@ -5069,6 +5064,7 @@ else
116 # instance it was reported that on HP-UX the gcc test will end up
117 # making a dummy file named `D' -- because `-MD' means `put the output
118 # in D'.
119+ rm -rf conftest.dir
120 mkdir conftest.dir
121 # Copy depcomp to subdir because otherwise we won't find it if we're
122 # using a relative directory.
123@@ -5128,7 +5124,7 @@ else
124 break
125 fi
126 ;;
127- msvisualcpp | msvcmsys)
128+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
129 # This compiler won't grok `-c -o', but also, the minuso test has
130 # not run yet. These depmodes are late enough in the game, and
131 # so weak that their functioning should not be impacted.
132@@ -6044,6 +6040,7 @@ else
133 # instance it was reported that on HP-UX the gcc test will end up
134 # making a dummy file named `D' -- because `-MD' means `put the output
135 # in D'.
136+ rm -rf conftest.dir
137 mkdir conftest.dir
138 # Copy depcomp to subdir because otherwise we won't find it if we're
139 # using a relative directory.
140@@ -6103,7 +6100,7 @@ else
141 break
142 fi
143 ;;
144- msvisualcpp | msvcmsys)
145+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
146 # This compiler won't grok `-c -o', but also, the minuso test has
147 # not run yet. These depmodes are late enough in the game, and
148 # so weak that their functioning should not be impacted.
149@@ -6848,6 +6845,7 @@ else
150 # instance it was reported that on HP-UX the gcc test will end up
151 # making a dummy file named `D' -- because `-MD' means `put the output
152 # in D'.
153+ rm -rf conftest.dir
154 mkdir conftest.dir
155 # Copy depcomp to subdir because otherwise we won't find it if we're
156 # using a relative directory.
157@@ -6905,7 +6903,7 @@ else
158 break
159 fi
160 ;;
161- msvisualcpp | msvcmsys)
162+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
163 # This compiler won't grok `-c -o', but also, the minuso test has
164 # not run yet. These depmodes are late enough in the game, and
165 # so weak that their functioning should not be impacted.
166@@ -9529,51 +9527,13 @@ if test x$grub_cv_apple_cc = xyes ; then
167 HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
168 fi 85 fi
169 86
170-if test "x$cross_compiling" = xyes; then 87-if test "x$cross_compiling" = xyes; then
@@ -192,7 +109,7 @@ Index: grub-1.99/configure
192- IFS=$as_save_IFS 109- IFS=$as_save_IFS
193- test -z "$as_dir" && as_dir=. 110- test -z "$as_dir" && as_dir=.
194- for ac_exec_ext in '' $ac_executable_extensions; do 111- for ac_exec_ext in '' $ac_executable_extensions; do
195- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 112- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
196- ac_cv_path_HELP2MAN="$as_dir/$ac_word$ac_exec_ext" 113- ac_cv_path_HELP2MAN="$as_dir/$ac_word$ac_exec_ext"
197- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 114- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
198- break 2 115- break 2
@@ -221,7 +138,7 @@ Index: grub-1.99/configure
221 138
222 # Check for functions and headers. 139 # Check for functions and headers.
223 for ac_func in posix_memalign memalign asprintf vasprintf getextmntent 140 for ac_func in posix_memalign memalign asprintf vasprintf getextmntent
224@@ -20309,6 +20269,7 @@ $as_echo_n "checking whether \`$CC' gene 141@@ -20477,6 +20432,7 @@ $as_echo_n "checking whether \`$CC' gene
225 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 142 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
226 /* end confdefs.h. */ 143 /* end confdefs.h. */
227 144
diff --git a/meta/recipes-bsp/grub/files/grub-1.99-fix-enable_execute_stack-check.patch b/meta/recipes-bsp/grub/files/grub-2.00-fix-enable_execute_stack-check.patch
index 9d7272b269..09ef4dbff9 100644
--- a/meta/recipes-bsp/grub/files/grub-1.99-fix-enable_execute_stack-check.patch
+++ b/meta/recipes-bsp/grub/files/grub-2.00-fix-enable_execute_stack-check.patch
@@ -13,14 +13,14 @@ configure:20327: error: ccache i586-poky-linux-gcc -m32 -march=core2 -msse3
13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
142012/04/13 142012/04/13
15 15
16Index: grub-1.99/acinclude.m4 16Index: grub-2.00/acinclude.m4
17=================================================================== 17===================================================================
18--- grub-1.99.orig/acinclude.m4 18--- grub-2.00.orig/acinclude.m4
19+++ grub-1.99/acinclude.m4 19+++ grub-2.00/acinclude.m4
20@@ -317,6 +317,7 @@ dnl Check if the C compiler generates ca 20@@ -317,6 +317,7 @@ dnl Check if the C compiler generates ca
21 AC_DEFUN([grub_CHECK_ENABLE_EXECUTE_STACK],[ 21 AC_DEFUN([grub_CHECK_ENABLE_EXECUTE_STACK],[
22 AC_MSG_CHECKING([whether `$CC' generates calls to `__enable_execute_stack()']) 22 AC_MSG_CHECKING([whether `$CC' generates calls to `__enable_execute_stack()'])
23 AC_LANG_CONFTEST([[ 23 AC_LANG_CONFTEST([AC_LANG_SOURCE([[
24+void g (int); 24+void g (int);
25 void f (int (*p) (void)); 25 void f (int (*p) (void));
26 void g (int i) 26 void g (int i)
diff --git a/meta/recipes-bsp/grub/files/grub-1.99-fpmath-sse-387-fix.patch b/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch
index bea594406f..bea594406f 100644
--- a/meta/recipes-bsp/grub/files/grub-1.99-fpmath-sse-387-fix.patch
+++ b/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch
diff --git a/meta/recipes-bsp/grub/files/grub-no-unused-result.patch b/meta/recipes-bsp/grub/files/grub-no-unused-result.patch
new file mode 100644
index 0000000000..ecd7f36ee3
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/grub-no-unused-result.patch
@@ -0,0 +1,18 @@
1Signed-off-by: Radu Moisan <radu.moisan@intel.com>
2
3I had an error because of an unused return value for read().
4I added -Wno-unused-result.
5
6Index: grub-2.00/configure.ac
7===================================================================
8--- grub-2.00.orig/configure.ac 2012-08-13 16:32:33.000000000 +0300
9+++ grub-2.00/configure.ac 2012-08-13 16:38:22.000000000 +0300
10@@ -394,7 +394,7 @@
11 LIBS=""
12
13 # debug flags.
14-WARN_FLAGS="-Wall -W -Wshadow -Wold-style-definition -Wpointer-arith -Wundef -Wextra -Waddress -Wattributes -Wcast-align -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wempty-body -Wendif-labels -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmain -Wmissing-braces -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-noreturn -Wmultichar -Wnonnull -Woverflow -Wparentheses -Wpointer-arith -Wpointer-to-int-cast -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wstrict-aliasing -Wswitch -Wtrigraphs -Wundef -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wvariadic-macros -Wvolatile-register-var -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wpointer-sign"
15+WARN_FLAGS="-Wall -W -Wshadow -Wold-style-definition -Wpointer-arith -Wundef -Wextra -Waddress -Wattributes -Wcast-align -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wempty-body -Wendif-labels -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmain -Wmissing-braces -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-noreturn -Wmultichar -Wnonnull -Woverflow -Wparentheses -Wpointer-arith -Wpointer-to-int-cast -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wstrict-aliasing -Wswitch -Wtrigraphs -Wundef -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wno-unused-result -Wvariadic-macros -Wvolatile-register-var -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wpointer-sign"
16 HOST_CFLAGS="$HOST_CFLAGS $WARN_FLAGS"
17 TARGET_CFLAGS="$TARGET_CFLAGS $WARN_FLAGS -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations"
18 TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
diff --git a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb b/meta/recipes-bsp/grub/grub-efi-native_2.00.bb
index 9e923bd840..776bf23f2d 100644
--- a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
+++ b/meta/recipes-bsp/grub/grub-efi-native_2.00.bb
@@ -16,24 +16,20 @@ 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
17DEPENDS = "autogen-native" 17DEPENDS = "autogen-native"
18RDEPENDS_${PN} = "diffutils freetype" 18RDEPENDS_${PN} = "diffutils freetype"
19PR = "r10" 19PR = "r0"
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.
23PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native" 23PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native"
24 24
25SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ 25SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
26 file://grub-1.99_fix_for_automake_1.11.2.patch \ 26 file://grub-2.00-fpmath-sse-387-fix.patch \
27 file://grub-1.99-fpmath-sse-387-fix.patch \ 27 file://grub-2.00-fix-enable_execute_stack-check.patch \
28 file://grub-1.99-gcc-4.7.0.patch \ 28 file://grub-2.00-disable-help2man.patch \
29 file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \ 29 file://grub-no-unused-result.patch \
30 file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \
31 file://grub-1.99-fix-enable_execute_stack-check.patch \
32 file://grub-1.99-disable-help2man.patch \
33 " 30 "
34 31SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
35SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" 32SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"
36SRC_URI[sha256sum] = "b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff"
37 33
38COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' 34COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
39 35
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index c88e095d7d..821d9ffe17 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -17,7 +17,7 @@ PR = "r0"
17 17
18SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ 18SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
19 file://grub-install.in.patch \ 19 file://grub-install.in.patch \
20 file://grub-1.99-fpmath-sse-387-fix.patch \ 20 file://grub-2.00-fpmath-sse-387-fix.patch \
21 file://remove-gets.patch \ 21 file://remove-gets.patch \
22 file://40_custom" 22 file://40_custom"
23 23