Merge pull request #952 from PimentNoir/path-cleanup

cleanup: remove for real out of tree projects and options file, featu…
This commit is contained in:
MilhouseVH 2016-11-18 21:38:09 +00:00 committed by GitHub
commit 9e86ba8cba
3 changed files with 2 additions and 12 deletions

View File

@ -288,13 +288,13 @@ dashes="==========================="
check_config() {
dashes="==========================="
if [ ! -d $PROJECT_DIR/$PROJECT -a ! -d $HOME/.libreelec/projects/$PROJECT ]; then
if [ ! -d $PROJECT_DIR/$PROJECT ]; then
check_project="$check_project\n $dashes$dashes$dashes"
check_project="$check_project\n ERROR: Project not found, use a valid project or create a new config"
check_project="$check_project\n $dashes$dashes$dashes"
check_project="$check_project\n\n Valid projects:"
for projects in $PROJECT_DIR/* $HOME/.libreelec/projects/*; do
for projects in $PROJECT_DIR/*; do
check_project="$check_project\n - $(basename $projects)"
done
echo -e $check_project

View File

@ -89,14 +89,6 @@ fi
if [ -f "$HOME/.libreelec/options" ]; then
. $HOME/.libreelec/options
fi
if [ -f "$HOME/.libreelec/projects/$PROJECT/options" ]; then
. $HOME/.libreelec/projects/$PROJECT/options
fi
# read distro options from $HOME if available
if [ -f "$HOME/.libreelec/options.$DISTRO" ]; then
. $HOME/.libreelec/options.$DISTRO
fi
# install devtools on development builds
if [ -z "$DEVTOOLS" -a "$LIBREELEC_VERSION" = "devel" ]; then

View File

@ -34,8 +34,6 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader
cp -PR $BUILD/u-boot-*/u-boot*.img $RELEASE_DIR/3rdparty/bootloader 2>/dev/null || :
cp -PR $PROJECT_DIR/$PROJECT/bootloader/uEnv*.txt $RELEASE_DIR/3rdparty/bootloader 2>/dev/null || :
cp -PR $HOME/.openelec/bootloader/* $RELEASE_DIR/3rdparty/bootloader 2>/dev/null || :
cp -PR $HOME/.openelec/projects/$PROJECT/bootloader/* $RELEASE_DIR/3rdparty/bootloader 2>/dev/null || :
cp -PR $BUILD/linux-*/arch/$TARGET_KERNEL_ARCH/boot/dts/*.dtb $RELEASE_DIR/3rdparty/bootloader 2>/dev/null || :