Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -11,18 +11,24 @@ flags passed by Buildroot.
|
||||
|
||||
[Romain:
|
||||
- rebase on top of 3.0.1 release]
|
||||
[Bernd:
|
||||
- rebase on top of 3.0.5 release]
|
||||
[Benoît:
|
||||
- rebase on top of 3.0.6 release]
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
|
||||
---
|
||||
Make.defaults | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
Make.defaults | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/Make.defaults b/Make.defaults
|
||||
index 169273d..b0ddea0 100644
|
||||
index 51bd7d8..7d7e8e7 100755
|
||||
--- a/Make.defaults
|
||||
+++ b/Make.defaults
|
||||
@@ -80,14 +80,14 @@ endif
|
||||
@@ -85,14 +85,14 @@ OBJDIR := $(TOPDIR)/$(ARCH)
|
||||
#
|
||||
|
||||
# Arch-specific compilation flags
|
||||
@@ -40,20 +46,31 @@ index 169273d..b0ddea0 100644
|
||||
ifeq ($(HOSTARCH),x86_64)
|
||||
ARCH3264 = -m32
|
||||
endif
|
||||
@@ -103,10 +103,10 @@ ifeq ($(ARCH),x86_64)
|
||||
@@ -109,19 +109,19 @@ ifeq ($(ARCH),x86_64)
|
||||
&& [ $(GCCMINOR) -ge "7" ] ) ) \
|
||||
&& echo 1)
|
||||
ifeq ($(GCCNEWENOUGH),1)
|
||||
- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
|
||||
+ override CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
|
||||
else ifeq ($(USING_CLANG),clang)
|
||||
- CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
|
||||
+ override CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
|
||||
endif
|
||||
|
||||
- CFLAGS += -mno-red-zone -mno-mmx -mno-sse
|
||||
+ override CFLAGS += -mno-red-zone -mno-mmx -mno-sse
|
||||
- CFLAGS += -mno-red-zone
|
||||
+ override CFLAGS += -mno-red-zone
|
||||
ifeq ($(HOSTARCH),ia32)
|
||||
ARCH3264 = -m64
|
||||
endif
|
||||
@@ -127,7 +127,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),mips64el)
|
||||
- CFLAGS += -march=mips64r2
|
||||
+ override CFLAGS += -march=mips64r2
|
||||
ARCH3264 = -mabi=64
|
||||
endif
|
||||
|
||||
@@ -142,7 +142,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264)
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),arm)
|
||||
@@ -62,19 +79,25 @@ index 169273d..b0ddea0 100644
|
||||
endif
|
||||
|
||||
# Generic compilation flags
|
||||
@@ -135,10 +135,10 @@ INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
|
||||
-I$(TOPDIR)/inc/protocol
|
||||
@@ -152,15 +152,15 @@ INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -
|
||||
# Only enable -fpic for non MinGW compilers (unneeded on MinGW)
|
||||
GCCMACHINE := $(shell $(CC) -dumpmachine)
|
||||
ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE)))
|
||||
- CFLAGS += -fpic
|
||||
+ override CFLAGS += -fpic
|
||||
endif
|
||||
|
||||
ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
|
||||
-CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
|
||||
+override CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
|
||||
-CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
|
||||
+override CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
|
||||
-fshort-wchar -fno-strict-aliasing \
|
||||
-ffreestanding -fno-stack-protector
|
||||
else
|
||||
-CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
|
||||
+override CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
|
||||
-fno-merge-constants -ffreestanding -fno-stack-protector \
|
||||
-CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
|
||||
+override CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
|
||||
-fshort-wchar -fno-strict-aliasing \
|
||||
-fno-merge-all-constants -ffreestanding -fno-stack-protector \
|
||||
-fno-stack-check
|
||||
endif
|
||||
--
|
||||
1.9.3
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
From 7e9a26b0fc0bd8ed64a5eced5ea78bcea8ae3bbc Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@openwide.fr>
|
||||
Date: Sat, 17 Jan 2015 18:44:04 +0100
|
||||
Subject: [PATCH 2/2] Fix parallel make failure for archives
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
The lib and gnuefi makefiles were using the lib.a() form which compiles
|
||||
and ar's as a pair instead of compiling all and then ar'ing which can
|
||||
parallelize better. This was resulting in build failures on larger values
|
||||
of -j.
|
||||
|
||||
See http://www.chemie.fu-berlin.de/chemnet/use/info/make/make_toc.html#TOC105
|
||||
for details.
|
||||
|
||||
[Romain:
|
||||
- rebase on top of 3.0.1 release]
|
||||
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
|
||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||||
---
|
||||
gnuefi/Makefile | 3 ++-
|
||||
lib/Makefile | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gnuefi/Makefile b/gnuefi/Makefile
|
||||
index d234ac0..d29575d 100644
|
||||
--- a/gnuefi/Makefile
|
||||
+++ b/gnuefi/Makefile
|
||||
@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
|
||||
+libgnuefi.a: $(OBJS)
|
||||
+ $(AR) rv $@ $(OBJS)
|
||||
|
||||
clean:
|
||||
rm -f $(TARGETS) *~ *.o $(OBJS)
|
||||
diff --git a/lib/Makefile b/lib/Makefile
|
||||
index 019ad57..c6abcae 100644
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -73,7 +73,8 @@ all: libsubdirs libefi.a
|
||||
libsubdirs:
|
||||
for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
|
||||
|
||||
-libefi.a: $(patsubst %,libefi.a(%),$(OBJS))
|
||||
+libefi.a: $(OBJS)
|
||||
+ $(AR) rv $@ $(OBJS)
|
||||
|
||||
clean:
|
||||
rm -f libefi.a *~ $(OBJS) */*.o
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
config BR2_PACKAGE_GNU_EFI
|
||||
bool "gnu-efi"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || \
|
||||
BR2_aarch64_be || BR2_i386 || BR2_x86_64
|
||||
help
|
||||
Develop EFI applications for IA-64 (IPF), IA-32 (x86), and
|
||||
x86_64 platforms using the GNU toolchain and the EFI
|
||||
development environment.
|
||||
Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64
|
||||
(IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain
|
||||
and the EFI development environment.
|
||||
|
||||
http://gnu-efi.sourceforge.net/
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# From http://sourceforge.net/projects/gnu-efi/files
|
||||
md5 c4099c443b6b0c2b04dedc33e7814ec0 gnu-efi-3.0.1.tar.bz2
|
||||
sha1 07eea4d72f7ecb7229aaa77ddd411de5673c67b6 gnu-efi-3.0.1.tar.bz2
|
||||
md5 46f633758a8a37db9fd6909fe270c26b gnu-efi-3.0.6.tar.bz2
|
||||
sha1 9f0f75b64c84423f3386da6f3200f5ed7471d9cb gnu-efi-3.0.6.tar.bz2
|
||||
# Locally computed
|
||||
sha256 21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91 gnu-efi-3.0.6.tar.bz2
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNU_EFI_VERSION = 3.0.1
|
||||
GNU_EFI_VERSION = 3.0.6
|
||||
GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
|
||||
GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
|
||||
GNU_EFI_INSTALL_STAGING = YES
|
||||
GNU_EFI_LICENSE = BSD-3c and/or GPLv2+ (gnuefi), BSD-3c (efilib)
|
||||
GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause (efilib)
|
||||
GNU_EFI_LICENSE_FILES = README.efilib
|
||||
|
||||
# gnu-efi is a set of library and header files used to build
|
||||
@@ -20,6 +20,10 @@ ifeq ($(BR2_i386),y)
|
||||
GNU_EFI_PLATFORM = ia32
|
||||
else ifeq ($(BR2_x86_64),y)
|
||||
GNU_EFI_PLATFORM = x86_64
|
||||
else ifeq ($(BR2_arm)$(BR2_armeb),y)
|
||||
GNU_EFI_PLATFORM = arm
|
||||
else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y)
|
||||
GNU_EFI_PLATFORM = aarch64
|
||||
endif
|
||||
|
||||
define GNU_EFI_BUILD_CMDS
|
||||
|
||||
Reference in New Issue
Block a user