summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-09-09 00:38:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-16 22:13:52 +0100
commit23613ef0f9220e66e065537a372c185c18047d32 (patch)
treec802ce2f944ee53480fe5ce29bb838eb5598ff44 /meta/recipes-bsp/grub
parentf8d38d5931378b8e095e946c94d96450ab53c6fd (diff)
downloadpoky-23613ef0f9220e66e065537a372c185c18047d32.tar.gz
grub-efi: Replace _BSD_SOURCE macro with _DEFAULT_SOURCE
This is needed with glibc 2.20 since _BSD_SOURCE macro is gone Khem fixed grub, but the grub-efi also needs it, the patch can't apply to grub-efi, so made a new patch for it. (From OE-Core rev: da120dec96f8f019c0fd50576fb7490689234257) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r--meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch32
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.00.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch b/meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch
new file mode 100644
index 0000000000..4f12628a4b
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch
@@ -0,0 +1,32 @@
1From eb6368e65f6988eebad26cebdec057f797bceb40 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 9 Sep 2014 00:02:30 -0700
4Subject: [PATCH] Fix build with glibc 2.20
5
6* grub-core/kern/emu/hostfs.c: squahes below warning
7 warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
8
9Upstream-Status: Submitted
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13---
14 grub-core/kern/emu/hostfs.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c
18index 3cb089c..a51ee32 100644
19--- a/grub-core/kern/emu/hostfs.c
20+++ b/grub-core/kern/emu/hostfs.c
21@@ -16,7 +16,7 @@
22 * You should have received a copy of the GNU General Public License
23 * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
24 */
25-#define _BSD_SOURCE
26+#define _DEFAULT_SOURCE
27 #include <grub/fs.h>
28 #include <grub/file.h>
29 #include <grub/disk.h>
30--
311.7.9.5
32
diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb
index 7b49493e3e..d213f31a20 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb
@@ -28,6 +28,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
28 file://fix-issue-with-flex-2.5.37.patch \ 28 file://fix-issue-with-flex-2.5.37.patch \
29 file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ 29 file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \
30 file://grub-2.00-add-oe-kernel.patch \ 30 file://grub-2.00-add-oe-kernel.patch \
31 file://grub-efi-fix-with-glibc-2.20.patch \
31 " 32 "
32SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" 33SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
33SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" 34SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"