Bump buildroot to 2019.02
This commit is contained in:
10
bsp/buildroot/support/dependencies/check-host-bison-flex.mk
Normal file
10
bsp/buildroot/support/dependencies/check-host-bison-flex.mk
Normal file
@@ -0,0 +1,10 @@
|
||||
# If the system lacks bison or flex, add
|
||||
# dependencies to suitable host packages
|
||||
|
||||
ifeq ($(shell which bison 2>/dev/null),)
|
||||
BR2_BISON_HOST_DEPENDENCY = host-bison
|
||||
endif
|
||||
|
||||
ifeq ($(shell which flex 2>/dev/null),)
|
||||
BR2_FLEX_HOST_DEPENDENCY = host-flex
|
||||
endif
|
||||
@@ -1,14 +1,9 @@
|
||||
# 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
|
||||
# Set this to either 3.8 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.
|
||||
# version, our cmake infra will catch it and build its own.
|
||||
#
|
||||
BR2_CMAKE_VERSION_MIN = 3.1
|
||||
BR2_CMAKE_VERSION_MIN = 3.8
|
||||
|
||||
BR2_CMAKE_CANDIDATES ?= cmake cmake3
|
||||
BR2_CMAKE ?= $(call suitable-host-package,cmake,\
|
||||
|
||||
3
bsp/buildroot/support/dependencies/check-host-gzip.mk
Normal file
3
bsp/buildroot/support/dependencies/check-host-gzip.mk
Normal file
@@ -0,0 +1,3 @@
|
||||
ifeq (,$(call suitable-host-package,gzip))
|
||||
BR2_GZIP_HOST_DEPENDENCY = host-gzip
|
||||
endif
|
||||
21
bsp/buildroot/support/dependencies/check-host-gzip.sh
Executable file
21
bsp/buildroot/support/dependencies/check-host-gzip.sh
Executable file
@@ -0,0 +1,21 @@
|
||||
#!/bin/sh
|
||||
|
||||
candidate="$1" # ignored
|
||||
|
||||
gzip="$(which gzip)"
|
||||
if [ ! -x "${gzip}" ]; then
|
||||
# echo nothing: no suitable gzip found
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# gzip displays its version string on stdout
|
||||
# pigz displays its version string on stderr
|
||||
version="$("${gzip}" --version 2>&1)"
|
||||
case "${version}" in
|
||||
(*pigz*)
|
||||
# echo nothing: no suitable gzip found
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
printf "%s" "${gzip}"
|
||||
@@ -1,5 +1,5 @@
|
||||
ifeq (,$(call suitable-host-package,lzip,$(LZCAT)))
|
||||
DEPENDENCIES_HOST_PREREQ += host-lzip
|
||||
BR2_LZIP_HOST_DEPENDENCY = host-lzip
|
||||
EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .lz
|
||||
LZCAT = $(HOST_DIR)/bin/lzip -d -c
|
||||
endif
|
||||
|
||||
21
bsp/buildroot/support/dependencies/check-host-make.mk
Normal file
21
bsp/buildroot/support/dependencies/check-host-make.mk
Normal file
@@ -0,0 +1,21 @@
|
||||
# Since version 2.28, glibc requires GNU Make >= 4.0
|
||||
# https://www.sourceware.org/ml/libc-alpha/2018-08/msg00003.html
|
||||
#
|
||||
# Set this to either 4.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 package infra will catch it and whine.
|
||||
#
|
||||
BR2_MAKE_VERSION_MIN = 4.0
|
||||
|
||||
BR2_MAKE ?= $(call suitable-host-package,make,\
|
||||
$(BR2_MAKE_VERSION_MIN) $(MAKE))
|
||||
|
||||
ifeq ($(BR2_MAKE),)
|
||||
BR2_MAKE = $(HOST_DIR)/bin/host-make -j$(PARALLEL_JOBS)
|
||||
BR2_MAKE1 = $(HOST_DIR)/bin/host-make -j1
|
||||
BR2_MAKE_HOST_DEPENDENCY = host-make
|
||||
else
|
||||
BR2_MAKE = $(MAKE)
|
||||
BR2_MAKE1 = $(MAKE1)
|
||||
endif
|
||||
37
bsp/buildroot/support/dependencies/check-host-make.sh
Executable file
37
bsp/buildroot/support/dependencies/check-host-make.sh
Executable file
@@ -0,0 +1,37 @@
|
||||
#!/bin/sh
|
||||
|
||||
# prevent shift error
|
||||
[ $# -lt 2 ] && exit 1
|
||||
|
||||
major_min="${1%.*}"
|
||||
minor_min="${1#*.}"
|
||||
|
||||
shift
|
||||
|
||||
# The host make program is already checked by dependencies.sh but we
|
||||
# want to check the version number even if Buildroot is able to use
|
||||
# GNU make >= 3.81 but some packages may require a more recent version.
|
||||
make="$1"
|
||||
|
||||
# Output of 'make --version' examples:
|
||||
# GNU Make 4.2.1
|
||||
# GNU Make 4.0
|
||||
# GNU Make 3.81
|
||||
version=`$make --version 2>&1 | sed -e 's/^.* \([0-9\.]\)/\1/g' -e 's/[-\
|
||||
].*//g' -e '1q'`
|
||||
|
||||
major=`echo "$version" | cut -d. -f1`
|
||||
minor=`echo "$version" | cut -d. -f2`
|
||||
|
||||
if [ $major -lt $major_min ]; then
|
||||
# echo nothing: no suitable make found
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ $major -eq $major_min -a $minor -lt $minor_min ]; then
|
||||
# echo nothing: no suitable make found
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# valid
|
||||
echo $make
|
||||
@@ -1,6 +1,6 @@
|
||||
TAR ?= tar
|
||||
|
||||
ifeq (,$(call suitable-host-package,tar,$(TAR)))
|
||||
DEPENDENCIES_HOST_PREREQ += host-tar
|
||||
TAR = $(HOST_DIR)/bin/tar
|
||||
BR2_TAR_HOST_DEPENDENCY = host-tar
|
||||
endif
|
||||
|
||||
@@ -20,10 +20,11 @@ major=`echo "$version" | cut -d. -f1`
|
||||
minor=`echo "$version" | cut -d. -f2`
|
||||
bugfix=`echo "$version" | cut -d. -f3`
|
||||
version_bsd=`$tar --version | grep 'bsdtar'`
|
||||
if [ ! -z "${version_bsd}" ] ; then
|
||||
# mark as invalid version - not all command line options are available
|
||||
major=0
|
||||
minor=0
|
||||
|
||||
# BSD tar does not have all the command-line options
|
||||
if [ -n "${version_bsd}" ] ; then
|
||||
# echo nothing: no suitable tar found
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Minimal version = 1.27 (previous versions do not correctly unpack archives
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# If it is not present, build our own host-xzcat
|
||||
|
||||
ifeq (,$(call suitable-host-package,xzcat,$(XZCAT)))
|
||||
DEPENDENCIES_HOST_PREREQ += host-xz
|
||||
BR2_XZCAT_HOST_DEPENDENCY = host-xz
|
||||
EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .xz .lzma
|
||||
XZCAT = $(HOST_DIR)/bin/xzcat
|
||||
endif
|
||||
|
||||
@@ -5,6 +5,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ifeq ($(BR2_FORCE_HOST_BUILD),y)
|
||||
# ignore all available host packages
|
||||
define suitable-host-package
|
||||
endef
|
||||
else
|
||||
# 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
|
||||
@@ -12,28 +17,19 @@
|
||||
define suitable-host-package
|
||||
$(shell support/dependencies/check-host-$(1).sh $(2))
|
||||
endef
|
||||
endif
|
||||
# host utilities needs host-tar to extract the source code tarballs, so
|
||||
# ensure check-host-tar.mk is included before the rest
|
||||
include support/dependencies/check-host-tar.mk
|
||||
-include $(sort $(filter-out %-tar.mk,$(wildcard support/dependencies/check-host-*.mk)))
|
||||
|
||||
ifeq ($(BR2_CCACHE),y)
|
||||
DEPENDENCIES_HOST_PREREQ += host-ccache
|
||||
endif
|
||||
|
||||
core-dependencies:
|
||||
dependencies:
|
||||
@MAKE="$(MAKE)" DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
|
||||
$(TOPDIR)/support/dependencies/dependencies.sh
|
||||
|
||||
$(DEPENDENCIES_HOST_PREREQ): HOSTCC=$(HOSTCC_NOCCACHE)
|
||||
$(DEPENDENCIES_HOST_PREREQ): HOSTCXX=$(HOSTCXX_NOCCACHE)
|
||||
$(DEPENDENCIES_HOST_PREREQ): core-dependencies
|
||||
|
||||
dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)
|
||||
|
||||
################################################################################
|
||||
#
|
||||
# Toplevel Makefile options
|
||||
#
|
||||
################################################################################
|
||||
.PHONY: dependencies core-dependencies
|
||||
.PHONY: dependencies
|
||||
|
||||
@@ -181,6 +181,14 @@ if test "${missing_progs}" = "yes" ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check that the python version is at least 2.7
|
||||
PYTHON_VERSION=$(python -V 2>&1 |awk '{ split($2, v, "."); print v[1] v[2] }')
|
||||
if [ $PYTHON_VERSION -lt 27 ]; then
|
||||
echo
|
||||
echo "You have '$(python -V 2>&1)' installed. Python >= 2.7 is required"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then
|
||||
if ! which locale > /dev/null ; then
|
||||
echo
|
||||
@@ -258,6 +266,10 @@ if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then
|
||||
required_perl_modules="$required_perl_modules Math::BigRat"
|
||||
fi
|
||||
|
||||
if grep -q ^BR2_PACKAGE_WHOIS=y $BR2_CONFIG ; then
|
||||
required_perl_modules="$required_perl_modules autodie"
|
||||
fi
|
||||
|
||||
# This variable will keep the modules that are missing in your system.
|
||||
missing_perl_modules=""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user