rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bsp/buildroot/support/dependencies/check-host-cmake.mk
View File

@@ -1,7 +1,18 @@
BR2_CMAKE ?= cmake
# Versions before 3.0 are affected by the bug described in
# https://git.busybox.net/buildroot/commit/?id=ef2c1970e4bff3be3992014070392b0e6bc28bd2
# and fixed in upstream CMake in version 3.0:
# https://cmake.org/gitweb?p=cmake.git;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568
#
# Set this to either 3.0 or higher, depending on the highest minimum
# version required by any of the packages bundled in Buildroot. If a
# package is bumped or a new one added, and it requires a higher
# version, our cmake infra will catch it and whine.
#
BR2_CMAKE_VERSION_MIN = 3.1
ifneq (,$(call suitable-host-package,cmake,$(BR2_CMAKE)))
USE_SYSTEM_CMAKE = YES
else
BR2_CMAKE ?= cmake
ifeq ($(call suitable-host-package,cmake,\
$(BR2_CMAKE) $(BR2_CMAKE_VERSION_MIN)),)
BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake
BR2_CMAKE_HOST_DEPENDENCY = host-cmake
endif

61
bsp/buildroot/support/dependencies/check-host-cmake.sh
View File

@@ -1,30 +1,47 @@
#!/bin/sh
candidate="$1"
candidate="${1}"
version_min="${2}"
cmake=`which $candidate`
if [ ! -x "$cmake" ]; then
# echo nothing: no suitable cmake found
exit 1
major_min="${version_min%.*}"
minor_min="${version_min#*.}"
# cmake-3.7 incorrectly handles rpath, linking to host libraries
blacklist_version="3.7"
cmake=`which ${candidate}`
if [ ! -x "${cmake}" ]; then
# echo nothing: no suitable cmake found
exit 1
fi
version=`$cmake --version | head -n1 | cut -d\ -f3`
major=`echo "$version" | cut -d. -f1`
minor=`echo "$version" | cut -d. -f2`
# Extract version X.Y from versions in the form X.Y or X.Y.Z
# with X, Y and Z numbers with one or more digits each, e.g.
# 3.2 -> 3.2
# 3.2.3 -> 3.2
# 3.2.42 -> 3.2
# 3.10 -> 3.10
# 3.10.4 -> 3.10
# 3.10.42 -> 3.10
version="$(${cmake} --version \
|sed -r -e '/.* ([[:digit:]]+\.[[:digit:]]+).*$/!d;' \
-e 's//\1/'
)"
major="${version%.*}"
minor="${version#*.}"
# Versions before 3.0 are affected by the bug described in
# https://git.busybox.net/buildroot/commit/?id=ef2c1970e4bff3be3992014070392b0e6bc28bd2
# and fixed in upstream CMake in version 3.0:
# https://cmake.org/gitweb?p=cmake.git;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568
major_min=3
minor_min=0
if [ $major -gt $major_min ]; then
echo $cmake
if [ "${version}" = "${blacklist_version}" ]; then
# echo nothing: no suitable cmake found
exit 1
fi
if [ ${major} -gt ${major_min} ]; then
echo "${cmake}"
else
if [ $major -eq $major_min -a $minor -ge $minor_min ]; then
echo $cmake
else
# echo nothing: no suitable cmake found
exit 1
fi
if [ ${major} -eq ${major_min} -a ${minor} -ge ${minor_min} ]; then
echo "${cmake}"
else
# echo nothing: no suitable cmake found
exit 1
fi
fi

5
bsp/buildroot/support/dependencies/check-host-lzip.mk Normal file
View File

@@ -0,0 +1,5 @@
ifeq (,$(call suitable-host-package,lzip,$(LZCAT)))
DEPENDENCIES_HOST_PREREQ += host-lzip
EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .lz
LZCAT = $(HOST_DIR)/usr/bin/lzip -d -c
endif

14
bsp/buildroot/support/dependencies/check-host-lzip.sh Executable file
View File

@@ -0,0 +1,14 @@
#!/bin/sh
candidate="$1"
lzip=`which $candidate 2>/dev/null`
if [ ! -x "$lzip" ]; then
lzip=`which lzip 2>/dev/null`
if [ ! -x "$lzip" ]; then
# echo nothing: no suitable lzip found
exit 1
fi
fi
echo $lzip

1
bsp/buildroot/support/dependencies/check-host-xzcat.mk
View File

@@ -3,5 +3,6 @@
ifeq (,$(call suitable-host-package,xzcat,$(XZCAT)))
DEPENDENCIES_HOST_PREREQ += host-xz
EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .xz .lzma
XZCAT = $(HOST_DIR)/usr/bin/xzcat
endif

2
bsp/buildroot/support/dependencies/dependencies.mk
View File

@@ -5,8 +5,6 @@
#
################################################################################
DEPENDENCIES_HOST_PREREQ :=
# suitable-host-pkg: calls check-host-$(1).sh shell script. Parameter (2)
# can be the candidate to be checked. If not present, the check-host-$(1).sh
# script should use 'which' to find a candidate. The script should return

13
bsp/buildroot/support/dependencies/dependencies.sh
View File

@@ -69,6 +69,10 @@ check_prog_host "which"
# Verify that sed is installed
check_prog_host "sed"
# 'file' must be present and must be exactly /usr/bin/file,
# otherwise libtool fails in incomprehensible ways.
check_prog_host "/usr/bin/file"
# Check make
MAKE=$(which make 2> /dev/null)
if [ -z "$MAKE" ] ; then
@@ -178,8 +182,7 @@ if test "${missing_progs}" = "yes" ; then
exit 1
fi
if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG > /dev/null && \
grep ^BR2_ENABLE_LOCALE=y $BR2_CONFIG > /dev/null ; then
if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then
if ! which locale > /dev/null ; then
echo
echo "You need locale support on your build machine to build a toolchain supporting locales"
@@ -238,8 +241,14 @@ fi
# Check that the Perl installation is complete enough for Buildroot.
required_perl_modules="Data::Dumper" # Needed to build host-autoconf
required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl
required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake
if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then
required_perl_modules="$required_perl_modules Math::BigInt"
required_perl_modules="$required_perl_modules Math::BigRat"
fi
# This variable will keep the modules that are missing in your system.
missing_perl_modules=""