config: source config/arch.ARCH in options instead of path

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2021-06-12 07:10:15 +00:00
parent ef9b52dec2
commit e480a7ecd0
2 changed files with 8 additions and 8 deletions

View File

@ -43,21 +43,26 @@ fi
# read DISTRO version information
. "${DISTRO_DIR}/${DISTRO}/version" || die "\nERROR: No distro version present\n"
# read DISTRO options if available
# read DISTRO options
if [ -f "${DISTRO_DIR}/${DISTRO}/options" ]; then
. "${DISTRO_DIR}/${DISTRO}/options"
fi
# read PROJECT options if available
# read PROJECT options
if [ -f "${PROJECT_DIR}/${PROJECT}/options" ]; then
. "${PROJECT_DIR}/${PROJECT}/options"
fi
# read DEVICE options if available
# read DEVICE options
if [ -f "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options" ]; then
. "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options"
fi
# read architecture defaults
if [ -f "config/arch.${TARGET_ARCH}" ]; then
. "config/arch.${TARGET_ARCH}"
fi
# projects can set KERNEL_NAME (kernel.img)
KERNEL_NAME="${KERNEL_NAME:-KERNEL}"

View File

@ -13,11 +13,6 @@ set -e
TARGET_IMG=${TARGET_DIR:-$ROOT/target}
ADDONS=addons
# include ARCH specific options
if [ -f config/arch.$TARGET_ARCH ]; then
. config/arch.$TARGET_ARCH
fi
[ -z "${HOST_NAME}" ] && export HOST_NAME="$($LOCAL_CC -dumpmachine)"
TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}