Update buildroot to 2021.02.1 (#1312)
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
@@ -2,6 +2,9 @@
|
||||
# vi: set sw=4 ts=4:
|
||||
|
||||
export LC_ALL=C
|
||||
TAB="$(printf '\t')"
|
||||
NL="
|
||||
"
|
||||
|
||||
# Verify that grep works
|
||||
echo "WORKS" | grep "WORKS" >/dev/null 2>&1
|
||||
@@ -35,9 +38,9 @@ case ":${PATH:-unset}:" in
|
||||
echo "PATH environment variable. This doesn't work."
|
||||
exit 1
|
||||
;;
|
||||
(*"
|
||||
"*) printf "\n"
|
||||
printf "Your PATH contains a newline (\\\n) character.\n"
|
||||
(*" "*|*"${TAB}"*|*"${NL}"*)
|
||||
printf "\n"
|
||||
printf "Your PATH contains spaces, TABs, and/or newline (\\\n) characters.\n"
|
||||
printf "This doesn't work. Fix you PATH.\n"
|
||||
exit 1
|
||||
;;
|
||||
|
||||
@@ -59,7 +59,7 @@ mk_tar_gz() {
|
||||
LC_ALL=C sort <"${tmp}.list" >"${tmp}.sorted"
|
||||
|
||||
# Create POSIX tarballs, since that's the format the most reproducible
|
||||
tar cf - --transform="s#^\./#${base_dir}/#" \
|
||||
tar cf - --transform="s#^\./#${base_dir}/#S" \
|
||||
--numeric-owner --owner=0 --group=0 --mtime="${date}" \
|
||||
--format=posix --pax-option="${pax_options}" \
|
||||
-T "${tmp}.sorted" >"${tmp}.tar"
|
||||
|
||||
@@ -43,14 +43,16 @@ _svn() {
|
||||
eval ${SVN} "${@}"
|
||||
}
|
||||
|
||||
_svn export ${verbose} "${@}" "'${uri}@${rev}'" "'${basename}'"
|
||||
_svn export --ignore-keywords ${verbose} "${@}" "'${uri}@${rev}'" "'${basename}'"
|
||||
|
||||
# Get the date of the revision, to generate reproducible archives.
|
||||
# The output format is YYYY-MM-DDTHH:MM:SS.mmmuuuZ (i.e. always in the
|
||||
# UTC timezone), which we can feed as-is to the --mtime option for tar.
|
||||
# In case there is a redirection (e.g. http -> https), just keep the
|
||||
# last line (svn outputs everything on stdout)
|
||||
date="$( _svn info --show-item last-changed-date "'${uri}@${rev}'" |tail -n 1 )"
|
||||
date="$( _svn info "'${uri}@${rev}'" \
|
||||
|sed -r -e '/^Last Changed Date: /!d; s///'
|
||||
)"
|
||||
|
||||
# Generate the archive.
|
||||
# We did a 'svn export' above, so it's not a working copy (there is no .svn
|
||||
|
||||
2
buildroot/support/misc/Vagrantfile
vendored
2
buildroot/support/misc/Vagrantfile
vendored
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# Buildroot version to use
|
||||
RELEASE='2021.02'
|
||||
RELEASE='2021.02.1'
|
||||
|
||||
### Change here for more memory/cores ###
|
||||
VM_MEMORY=2048
|
||||
|
||||
@@ -29,9 +29,7 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@)
|
||||
# if the project forces some of these flag variables, Buildroot is
|
||||
# screwed up and there is nothing Buildroot can do about that :(
|
||||
set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS")
|
||||
set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS")
|
||||
|
||||
# Build type from the Buildroot configuration
|
||||
set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration")
|
||||
@@ -44,7 +42,6 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur
|
||||
# * and make sure the project's CMake code extends them like this if needed:
|
||||
# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions")
|
||||
set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS")
|
||||
set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables")
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries")
|
||||
set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries")
|
||||
@@ -62,7 +59,12 @@ set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
|
||||
|
||||
# This toolchain file can be used both inside and outside Buildroot.
|
||||
set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@")
|
||||
set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@")
|
||||
if(@@TOOLCHAIN_HAS_CXX@@)
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS")
|
||||
set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS")
|
||||
set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@")
|
||||
endif()
|
||||
if(@@TOOLCHAIN_HAS_FORTRAN@@)
|
||||
set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS")
|
||||
set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS")
|
||||
|
||||
@@ -30,7 +30,7 @@ def compile_one(host_path, strip_root=None, verbose=False):
|
||||
if os.path.islink(host_path) or not os.path.isfile(host_path):
|
||||
return # only compile real files
|
||||
|
||||
if not re.match(r"^[_A-Za-z][_A-Za-z0-9]+\.py$",
|
||||
if not re.match(r"^[_A-Za-z][_A-Za-z0-9]*\.py$",
|
||||
os.path.basename(host_path)):
|
||||
return # only compile "importable" python modules
|
||||
|
||||
|
||||
Reference in New Issue
Block a user