diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-09-09 00:38:30 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-16 22:12:29 +0100 |
| commit | da120dec96f8f019c0fd50576fb7490689234257 (patch) | |
| tree | ce9bc14b70f676596cd6e05582085473f9d26910 /meta/recipes-bsp/grub | |
| parent | 8d3dc353c8857d27957c9db4ced8b2009f2e9b2a (diff) | |
| download | openembedded-core-da120dec96f8f019c0fd50576fb7490689234257.tar.gz openembedded-core-da120dec96f8f019c0fd50576fb7490689234257.tar.bz2 openembedded-core-da120dec96f8f019c0fd50576fb7490689234257.zip | |
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.
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>
Diffstat (limited to 'meta/recipes-bsp/grub')
| -rw-r--r-- | meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.00.bb | 1 |
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 @@ +From eb6368e65f6988eebad26cebdec057f797bceb40 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 9 Sep 2014 00:02:30 -0700 +Subject: [PATCH] Fix build with glibc 2.20 + +* grub-core/kern/emu/hostfs.c: squahes below warning + warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" + +Upstream-Status: Submitted + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + grub-core/kern/emu/hostfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c +index 3cb089c..a51ee32 100644 +--- a/grub-core/kern/emu/hostfs.c ++++ b/grub-core/kern/emu/hostfs.c +@@ -16,7 +16,7 @@ + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see <http://www.gnu.org/licenses/>. + */ +-#define _BSD_SOURCE ++#define _DEFAULT_SOURCE + #include <grub/fs.h> + #include <grub/file.h> + #include <grub/disk.h> +-- +1.7.9.5 + 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 \ file://fix-issue-with-flex-2.5.37.patch \ file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ file://grub-2.00-add-oe-kernel.patch \ + file://grub-efi-fix-with-glibc-2.20.patch \ " SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" |