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: clean up recursion test

Browse Source
This commit is contained in:
MilhouseVH 2018-08-22 00:40:35 +01:00
parent 0b6ce63a52
commit d949dcb7d0
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/functions
View File

@ -238,14 +238,8 @@ kernel_version() {
kernel_config_path() { kernel_config_path() {
local cfg pkg_linux_dir pkg_linux_version config_name local cfg pkg_linux_dir pkg_linux_version config_name
# avoid infinite recursion if this is called by linux pkg_linux_version="$(get_pkg_version linux)"
if [ "$PKG_NAME" = "linux" ]; then pkg_linux_dir="$(get_pkg_directory linux)"
pkg_linux_version="$PKG_VERSION"
pkg_linux_dir="$PKG_DIR"
else
pkg_linux_version="$(get_pkg_version linux)"
pkg_linux_dir="$(get_pkg_directory linux)"
fi
config_name="linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf" config_name="linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf"
@ -349,11 +343,14 @@ get_pkg_directory() {
echo "$_PKG_DIR" echo "$_PKG_DIR"
} }
# get variable ($2) for package ($1) # get variable ($2) for package ($1).
# avoid infinite recursion if required package is already loaded.
get_pkg_variable() { get_pkg_variable() {
if [ -n "$1" -a -n "$2" ] ; then if [ -n "$1" -a -n "$2" ] ; then
cd $ROOT if [ "$1" != "$PKG_NAME" ]; then
. config/options $1 &>/dev/null cd $ROOT
. config/options $1 &>/dev/null
fi
echo "${!2}" echo "${!2}"
fi fi
} }