diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-08-28 19:35:07 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 18:03:05 +0100 |
commit | f61eac4a608282ac431981907710dea5ce7149e1 (patch) | |
tree | ea73166121a3772484067f5f310d887dd0bf62e6 /meta/recipes-bsp/grub | |
parent | 9164912018b5e7b9e8d4431453d14b2a5c59c1a2 (diff) | |
download | poky-f61eac4a608282ac431981907710dea5ce7149e1.tar.gz |
grub: Replace _BSD_SOURCE macro with _DEFAULT_SOURCE
This is needed with glibc 2.20 since _BSD_SOURCE
macro is gone
(From OE-Core rev: 12edeff6f23512ff88097f7ca4cf30ca3653d2eb)
Signed-off-by: Khem Raj <raj.khem@gmail.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/0001-Fix-build-with-glibc-2.20.patch | 32 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub_git.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0001-Fix-build-with-glibc-2.20.patch b/meta/recipes-bsp/grub/files/0001-Fix-build-with-glibc-2.20.patch new file mode 100644 index 0000000000..46aaa97cf2 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0001-Fix-build-with-glibc-2.20.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 275fe0269ecc00af4788afaf9dc151a50b25645b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 28 Aug 2014 19:26:14 -0700 | ||
4 | Subject: [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 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Submitted | ||
12 | |||
13 | --- | ||
14 | grub-core/kern/emu/hostfs.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c | ||
18 | index 7e725f6..8dd8e65 100644 | ||
19 | --- a/grub-core/kern/emu/hostfs.c | ||
20 | +++ b/grub-core/kern/emu/hostfs.c | ||
21 | @@ -19,7 +19,7 @@ | ||
22 | |||
23 | #include <config-util.h> | ||
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 | -- | ||
31 | 2.1.0 | ||
32 | |||
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index f74bae8eb6..2a6392b82e 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb | |||
@@ -21,6 +21,7 @@ SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e" | |||
21 | SRC_URI = "git://git.savannah.gnu.org/grub.git \ | 21 | SRC_URI = "git://git.savannah.gnu.org/grub.git \ |
22 | file://autogen.sh-exclude-pc.patch \ | 22 | file://autogen.sh-exclude-pc.patch \ |
23 | file://grub-2.00-add-oe-kernel.patch \ | 23 | file://grub-2.00-add-oe-kernel.patch \ |
24 | file://0001-Fix-build-with-glibc-2.20.patch \ | ||
24 | " | 25 | " |
25 | 26 | ||
26 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |