Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
From f30c692c1f9ef0e93bee2b408a24baa017f1ca9d Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Serbinenko <phcoder@gmail.com>
|
||||
Date: Thu, 7 Nov 2013 01:01:47 +0100
|
||||
Subject: [PATCH] * grub-core/gettext/gettext.c (main_context),
|
||||
(secondary_context): Define after defining type and not before.
|
||||
|
||||
[Thomas: backport from upstream commit
|
||||
f30c692c1f9ef0e93bee2b408a24baa017f1ca9d, and remove ChangeLog
|
||||
modifications to avoid conflicts.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
grub-core/gettext/gettext.c | 4 ++--
|
||||
2 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
|
||||
index df73570..4880cef 100644
|
||||
--- a/grub-core/gettext/gettext.c
|
||||
+++ b/grub-core/gettext/gettext.c
|
||||
@@ -34,8 +34,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
||||
http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html .
|
||||
*/
|
||||
|
||||
-static struct grub_gettext_context main_context, secondary_context;
|
||||
-
|
||||
static const char *(*grub_gettext_original) (const char *s);
|
||||
|
||||
struct grub_gettext_msg
|
||||
@@ -69,6 +67,8 @@ struct grub_gettext_context
|
||||
struct grub_gettext_msg *grub_gettext_msg_list;
|
||||
};
|
||||
|
||||
+static struct grub_gettext_context main_context, secondary_context;
|
||||
+
|
||||
#define MO_MAGIC_NUMBER 0x950412de
|
||||
|
||||
static grub_err_t
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -154,8 +154,8 @@ endif # BR2_TARGET_GRUB2_I386_PC
|
||||
|
||||
config BR2_TARGET_GRUB2_BUILTIN_MODULES
|
||||
string "builtin modules"
|
||||
default "boot linux ext2 fat part_msdos part_gpt normal biosdisk" if BR2_TARGET_GRUB2_I386_PC
|
||||
default "boot linux ext2 fat part_msdos part_gpt normal efi_gop" \
|
||||
default "boot linux ext2 fat squash4 part_msdos part_gpt normal biosdisk" if BR2_TARGET_GRUB2_I386_PC
|
||||
default "boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop" \
|
||||
if BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI
|
||||
|
||||
config BR2_TARGET_GRUB2_BUILTIN_CONFIG
|
||||
|
||||
@@ -2,5 +2,5 @@ set default="0"
|
||||
set timeout="5"
|
||||
|
||||
menuentry "Buildroot" {
|
||||
linux /boot/bzImage root=/dev/sda1 console=tty1
|
||||
linux /boot/bzImage root=/dev/sda1 rootwait console=tty1
|
||||
}
|
||||
|
||||
@@ -45,6 +45,9 @@ endif
|
||||
# the confusion, it also uses NM, OBJCOPY and STRIP to build the
|
||||
# bootloader itself; none of these are used to build the native
|
||||
# tools.
|
||||
#
|
||||
# NOTE: TARGET_STRIP is overridden by BR2_STRIP_none, so always
|
||||
# use the cross compile variant to ensure grub2 builds
|
||||
|
||||
GRUB2_CONF_ENV = \
|
||||
$(HOST_CONFIGURE_OPTS) \
|
||||
@@ -55,14 +58,14 @@ GRUB2_CONF_ENV = \
|
||||
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
NM="$(TARGET_NM)" \
|
||||
OBJCOPY="$(TARGET_OBJCOPY)" \
|
||||
STRIP="$(TARGET_STRIP)"
|
||||
STRIP="$(TARGET_CROSS)strip"
|
||||
|
||||
GRUB2_CONF_OPTS = \
|
||||
--target=$(GRUB2_TARGET) \
|
||||
--with-platform=$(GRUB2_PLATFORM) \
|
||||
--disable-grub-mkfont \
|
||||
--enable-efiemu=no \
|
||||
--enable-liblzma=no \
|
||||
ac_cv_lib_lzma_lzma_code=no \
|
||||
--enable-device-mapper=no \
|
||||
--enable-libzfs=no \
|
||||
--disable-werror
|
||||
|
||||
Reference in New Issue
Block a user