Bump buidlroot version to 2018.02.6
This commit is contained in:
7
bsp/buildroot/support/misc/Buildroot.cmake
Normal file
7
bsp/buildroot/support/misc/Buildroot.cmake
Normal file
@@ -0,0 +1,7 @@
|
||||
# Impersonate a Linux system. Afterall, that's what we are...
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
include(Platform/Linux)
|
||||
|
||||
# Override problematic settings, to avoid RPATH against host lib directories.
|
||||
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
|
||||
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
|
||||
2
bsp/buildroot/support/misc/Vagrantfile
vendored
2
bsp/buildroot/support/misc/Vagrantfile
vendored
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# Buildroot version to use
|
||||
RELEASE='2017.02'
|
||||
RELEASE='2018.02'
|
||||
|
||||
### Change here for more memory/cores ###
|
||||
VM_MEMORY=2048
|
||||
|
||||
47
bsp/buildroot/support/misc/relocate-sdk.sh
Executable file
47
bsp/buildroot/support/misc/relocate-sdk.sh
Executable file
@@ -0,0 +1,47 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
if [ "$#" -ne 0 ]; then
|
||||
echo "Run this script to relocate the buildroot SDK at that location"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
LOCFILE="share/buildroot/sdk-location"
|
||||
FILEPATH="$(readlink -f "$0")"
|
||||
NEWPATH="$(dirname "${FILEPATH}")"
|
||||
|
||||
cd "${NEWPATH}"
|
||||
if [ ! -r "${LOCFILE}" ]; then
|
||||
echo "Previous location of the buildroot SDK not found!"
|
||||
exit 1
|
||||
fi
|
||||
OLDPATH="$(cat "${LOCFILE}")"
|
||||
|
||||
if [ "${NEWPATH}" = "${OLDPATH}" ]; then
|
||||
echo "This buildroot SDK has already been relocated!"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Check if the path substitution does work properly, e.g. a tree
|
||||
# "/a/b/c" copied into "/a/b/c/a/b/c/" would not be allowed.
|
||||
newpath="$(sed -e "s|${OLDPATH}|${NEWPATH}|g" "${LOCFILE}")"
|
||||
if [ "${NEWPATH}" != "${newpath}" ]; then
|
||||
echo "Something went wrong with substituting the path!"
|
||||
echo "Please choose another location for your SDK!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Relocating the buildroot SDK from ${OLDPATH} to ${NEWPATH} ..."
|
||||
|
||||
# Make sure file uses the right language
|
||||
export LC_ALL=C
|
||||
# Replace the old path with the new one in all text files
|
||||
grep -lr "${OLDPATH}" . | while read -r FILE ; do
|
||||
if file -b --mime-type "${FILE}" | grep -q '^text/' && [ "${FILE}" != "${LOCFILE}" ]
|
||||
then
|
||||
sed -i "s|${OLDPATH}|${NEWPATH}|g" "${FILE}"
|
||||
fi
|
||||
done
|
||||
|
||||
# At the very end, we update the location file to not break the
|
||||
# SDK if this script gets interruted.
|
||||
sed -i "s|${OLDPATH}|${NEWPATH}|g" ${LOCFILE}
|
||||
@@ -25,5 +25,5 @@ can extract as root:
|
||||
|
||||
Those image files are created using the contents of the target/
|
||||
directory, but there is a post-processing step to create device files
|
||||
and set owernship/permissions properly even if Buildroot does not run
|
||||
and set ownership/permissions properly even if Buildroot does not run
|
||||
as root.
|
||||
|
||||
@@ -4,13 +4,17 @@
|
||||
#
|
||||
|
||||
# In order to allow the toolchain to be relocated, we calculate the
|
||||
# HOST_DIR based on this file's location: $(HOST_DIR)/usr/share/buildroot
|
||||
# HOST_DIR based on this file's location: $(HOST_DIR)/share/buildroot
|
||||
# and store it in RELOCATED_HOST_DIR.
|
||||
# All the other variables that need to refer to HOST_DIR will use the
|
||||
# RELOCATED_HOST_DIR variable.
|
||||
string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR})
|
||||
string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
# Point cmake to the location where we have our custom modules,
|
||||
# so that it can find our custom platform description.
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Buildroot)
|
||||
set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@)
|
||||
|
||||
# Set the {C,CXX}FLAGS appended by CMake depending on the build type
|
||||
@@ -44,7 +48,7 @@ set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS
|
||||
|
||||
set(CMAKE_INSTALL_SO_NO_EXE 0)
|
||||
|
||||
set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/usr/bin")
|
||||
set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin")
|
||||
set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
|
||||
set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
|
||||
Reference in New Issue
Block a user