From 9f298e28925d28210dbc0497886e1e9dafd07bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 18 Nov 2016 22:09:36 +0100 Subject: [PATCH] cleanup: remove for real out of tree projects and options file, features removal leafovers, etc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I think it's error prone and useless to the development of LE. I've left the possibilty to have a options file in your home directory but I do not think it's necessary. Signed-off-by: Jérôme Benoit --- config/functions | 4 ++-- config/options | 8 -------- packages/tools/u-boot/release | 2 -- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/config/functions b/config/functions index 0d24b6c5d1..5405a9e6d8 100644 --- a/config/functions +++ b/config/functions @@ -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 diff --git a/config/options b/config/options index 71706b7a7c..cc20c5204d 100644 --- a/config/options +++ b/config/options @@ -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 diff --git a/packages/tools/u-boot/release b/packages/tools/u-boot/release index d15f665e4a..6787a2f3fc 100755 --- a/packages/tools/u-boot/release +++ b/packages/tools/u-boot/release @@ -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 || :