Merge pull request #4822 from OpenELEC/package-updates

scripts/image: fix build after https://github.com/OpenELEC/OpenELEC.t…
This commit is contained in:
Stephan Raue 2016-03-04 23:00:22 +01:00
commit 0e31f7f684

View File

@ -254,18 +254,23 @@ fi
# remove n previous created release image
rm -rf $TARGET_IMG/$IMAGE_NAME.img.gz
if [ -n "$BOOTLOADER" ]; then
if [ -n "`find $HOME/.openelec/projects/$PROJECT/packages -type d -name $BOOTLOADER 2>/dev/null`" ]; then
BOOTLOADER_DIR=""
if [ -z "$BOOTLOADER_DIR" -a -d $HOME/.openelec/projects/$PROJECT/packages ]; then
BOOTLOADER_DIR=`find $HOME/.openelec/projects/$PROJECT/packages -type d -name $BOOTLOADER 2>/dev/null`
elif [ -n "`find $HOME/.openelec/packages -type d -name $BOOTLOADER 2>/dev/null`" ]; then
fi
if [ -z "$BOOTLOADER_DIR" -a -d $HOME/.openelec/packages ]; then
BOOTLOADER_DIR=`find $HOME/.openelec/packages -type d -name $BOOTLOADER 2>/dev/null`
elif [ -n "`find $PROJECT_DIR/$PROJECT/packages -type d -name $BOOTLOADER`" ]; then
fi
if [ -z "$BOOTLOADER_DIR" -a -d $PROJECT_DIR/$PROJECT/packages ]; then
BOOTLOADER_DIR=`find $PROJECT_DIR/$PROJECT/packages -type d -name $BOOTLOADER 2>/dev/null`
else
BOOTLOADER_DIR=""
fi
if [ -z "$BOOTLOADER_DIR" -o ! -d "$BOOTLOADER_DIR" ]; then
BOOTLOADER_DIR=`find $PACKAGES -type d -name $BOOTLOADER 2>/dev/null`
BOOTLOADER_DIR=`find $PACKAGES -type d -name $BOOTLOADER 2>/dev/null`
fi
if [ -d "$BOOTLOADER_DIR"/files ]; then