summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-04 12:30:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-03 12:34:23 +0000
commit07f304f4e28dc596b1420ae1cb6607d7706108e4 (patch)
treed2c4898e743e03374cc741b1418ca0a0b20ea1c7 /meta/recipes-bsp
parentdb915496d3e513f8d29dd5961764137b26ae8a71 (diff)
downloadpoky-07f304f4e28dc596b1420ae1cb6607d7706108e4.tar.gz
grub,guile,cpio,tar,wget: Fix gnulib for absense of gets in eglibc
eglibc 2.16 does not export gets anymore (From OE-Core rev: 043d67c6677fa87496c4c441e9d366e2003ab9aa) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Resolved merge conflicts with denzil branch and backported guile patch. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/grub/grub-1.99/remove-gets.patch20
-rw-r--r--meta/recipes-bsp/grub/grub_1.99.bb3
2 files changed, 22 insertions, 1 deletions
diff --git a/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch b/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch
new file mode 100644
index 0000000000..463f7847ad
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch
@@ -0,0 +1,20 @@
1ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: grub-1.99/grub-core/gnulib/stdio.in.h
7===================================================================
8--- grub-1.99.orig/grub-core/gnulib/stdio.in.h 2010-12-01 06:45:43.000000000 -0800
9+++ grub-1.99/grub-core/gnulib/stdio.in.h 2012-07-04 12:25:02.057099107 -0700
10@@ -140,8 +140,10 @@
11 /* It is very rare that the developer ever has full control of stdin,
12 so any use of gets warrants an unconditional warning. Assume it is
13 always declared, since it is required by C89. */
14+#if defined gets
15 #undef gets
16 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
17+#endif
18
19 #if @GNULIB_FOPEN@
20 # if @REPLACE_FOPEN@
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb
index 882f21d5b5..97475257d6 100644
--- a/meta/recipes-bsp/grub/grub_1.99.bb
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
13 13
14DEPENDS = "autogen-native" 14DEPENDS = "autogen-native"
15RDEPENDS_${PN} = "diffutils freetype" 15RDEPENDS_${PN} = "diffutils freetype"
16PR = "r7" 16PR = "r8"
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 \
@@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
23 file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \ 23 file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \
24 file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \ 24 file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \
25 file://grub-1.99-fix-enable_execute_stack-check.patch \ 25 file://grub-1.99-fix-enable_execute_stack-check.patch \
26 file://remove-gets.patch \
26 file://40_custom" 27 file://40_custom"
27 28
28SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" 29SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5"