jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

script/images: use get_pkg_directory helper

Browse Source
This commit is contained in:
MilhouseVH 2017-01-31 22:09:30 +00:00
parent d1785da461
commit a6a64db317
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/image
View File

@ -273,16 +273,9 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
rm -rf $TARGET_IMG/$IMAGE_NAME.img.gz rm -rf $TARGET_IMG/$IMAGE_NAME.img.gz
if [ -n "$BOOTLOADER" ]; then if [ -n "$BOOTLOADER" ]; then
BOOTLOADER_DIR="" BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
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`
fi
if [ -z "$BOOTLOADER_DIR" -o ! -d "$BOOTLOADER_DIR" ]; then if [ -d $BOOTLOADER_DIR/files ]; then
BOOTLOADER_DIR=`find $PACKAGES -type d -name $BOOTLOADER 2>/dev/null`
fi
if [ -d "$BOOTLOADER_DIR"/files ]; then
cp -R $BOOTLOADER_DIR/files/* $RELEASE_DIR cp -R $BOOTLOADER_DIR/files/* $RELEASE_DIR
fi fi
@ -290,7 +283,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
. $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/release . $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/release
elif [ -f $PROJECT_DIR/$PROJECT/bootloader/release ]; then elif [ -f $PROJECT_DIR/$PROJECT/bootloader/release ]; then
. $PROJECT_DIR/$PROJECT/bootloader/release . $PROJECT_DIR/$PROJECT/bootloader/release
elif [ -f "$BOOTLOADER_DIR"/release ]; then elif [ -f $BOOTLOADER_DIR/release ]; then
. $BOOTLOADER_DIR/release . $BOOTLOADER_DIR/release
fi fi
fi fi
@ -480,8 +473,8 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
# create System dir # create System dir
mkdir -p $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System mkdir -p $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System
BOOTLOADER_DIR=`find $PACKAGES -type d -name $BOOTLOADER 2>/dev/null` BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
if [ -d "$BOOTLOADER_DIR"/files/3rdparty/bootloader/ ]; then if [ -d $BOOTLOADER_DIR/files/3rdparty/bootloader/ ]; then
cp -PR $BOOTLOADER_DIR/files/3rdparty/bootloader/* $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System cp -PR $BOOTLOADER_DIR/files/3rdparty/bootloader/* $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System
fi fi