jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

config/functions: store package caches in build dir

Browse Source 
Storing the cache in an exported environment variable can
result in build failures if the cache exceeds the MAX_ARG_STRLEN
limit (128k on linux) which can be triggered by building in a
rather deeply nested directory.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2018-07-01 10:34:02 +02:00
parent 3e3cc3ded0
commit 670a95c1ae
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/functions
View File

@ -318,7 +318,7 @@ get_pkg_directory() {
local _PKG_ROOT_NAME=${1%:*} _ALL_DIRS _FOUND=0 _ANCHOR="@?+?@" _PKG_DIR _DIR local _PKG_ROOT_NAME=${1%:*} _ALL_DIRS _FOUND=0 _ANCHOR="@?+?@" _PKG_DIR _DIR
# Check for any available local package in preference to a global package # Check for any available local package in preference to a global package
for _DIR in $(echo -e "${_CACHE_PACKAGE_LOCAL}" | grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}"); do for _DIR in $(grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}" "${_CACHE_PACKAGE_LOCAL}"); do
_DIR="${_DIR%${_ANCHOR}}" _DIR="${_DIR%${_ANCHOR}}"
# found first, set $_PKG_DIR # found first, set $_PKG_DIR
_PKG_DIR="$_DIR" _PKG_DIR="$_DIR"
@ -329,7 +329,7 @@ get_pkg_directory() {
# If there's no local package available, use the global package # If there's no local package available, use the global package
if [ $_FOUND -eq 0 ]; then if [ $_FOUND -eq 0 ]; then
for _DIR in $(echo -e "${_CACHE_PACKAGE_GLOBAL}" | grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}"); do for _DIR in $(grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}" "${_CACHE_PACKAGE_GLOBAL}"); do
_DIR="${_DIR%${_ANCHOR}}" _DIR="${_DIR%${_ANCHOR}}"
# found first, set $_PKG_DIR # found first, set $_PKG_DIR
_PKG_DIR="$_DIR" _PKG_DIR="$_DIR"
@ -810,25 +810,28 @@ init_package_cache() {
local _ANCHOR="@?+?@" DIR local _ANCHOR="@?+?@" DIR
# If the package caches are unset, then populate them # If the package caches are unset, then populate them
if [ -z "${_CACHE_PACKAGE_LOCAL+x}" -o -z "${_CACHE_PACKAGE_GLOBAL+x}" ]; then if [ -z "${_CACHE_PACKAGE_LOCAL}" -o -z "${_CACHE_PACKAGE_GLOBAL}" ]; then
_CACHE_PACKAGE_LOCAL="" _CACHE_PACKAGE_LOCAL="${BUILD}/.cache_package_local"
_CACHE_PACKAGE_GLOBAL="" _CACHE_PACKAGE_GLOBAL="${BUILD}/.cache_package_global"
mkdir -p "${BUILD}"
: > "${_CACHE_PACKAGE_LOCAL}"
: > "${_CACHE_PACKAGE_GLOBAL}"
# cache project/device folder for a package # cache project/device folder for a package
if [ -n $DEVICE ]; then if [ -n $DEVICE ]; then
for DIR in $(find $ROOT/projects/$PROJECT/devices/$DEVICE/packages -type d 2>/dev/null); do for DIR in $(find $ROOT/projects/$PROJECT/devices/$DEVICE/packages -type d 2>/dev/null); do
[ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_LOCAL+="${DIR}${_ANCHOR}\n" [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_LOCAL}"
done done
fi fi
# cache project folder for a package # cache project folder for a package
for DIR in $(find $ROOT/projects/$PROJECT/packages -type d 2>/dev/null); do for DIR in $(find $ROOT/projects/$PROJECT/packages -type d 2>/dev/null); do
[ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_LOCAL+="${DIR}${_ANCHOR}\n" [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_LOCAL}"
done done
# cache packages folder # cache packages folder
for DIR in $(find $ROOT/$PACKAGES -type d 2>/dev/null); do for DIR in $(find $ROOT/$PACKAGES -type d 2>/dev/null); do
[ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_GLOBAL+="${DIR}${_ANCHOR}\n" [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_GLOBAL}"
done done
export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL