Merge pull request #487 from lrusak/image-libreelec-7.0

make the images as well when running make noobs
This commit is contained in:
Christian Hewitt 2016-06-25 09:22:16 +04:00 committed by GitHub
commit 6c2d00da81

View File

@ -253,7 +253,7 @@ fi
# set permissions # set permissions
chmod 0644 $TARGET_IMG/$IMAGE_NAME.system chmod 0644 $TARGET_IMG/$IMAGE_NAME.system
if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" ]; then if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]; then
RELEASE_DIR="target/$IMAGE_NAME" RELEASE_DIR="target/$IMAGE_NAME"
@ -338,7 +338,7 @@ fi
tar cf $TARGET_IMG/$IMAGE_NAME.tar -C target $IMAGE_NAME tar cf $TARGET_IMG/$IMAGE_NAME.tar -C target $IMAGE_NAME
# create image files if requested # create image files if requested
if [[ ( "$1" = "amlpkg" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then if [[ ( "$1" = "amlpkg" || "$1" = "noobs" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then
# projects can set KERNEL_NAME (kernel.img) # projects can set KERNEL_NAME (kernel.img)
if [ -z "$KERNEL_NAME" ] ; then if [ -z "$KERNEL_NAME" ] ; then
KERNEL_NAME="KERNEL" KERNEL_NAME="KERNEL"
@ -372,6 +372,9 @@ fi
$SCRIPTS/mkimage $SCRIPTS/mkimage
fi fi
# cleanup release dir
rm -rf $RELEASE_DIR
# create WeTek Play (Amlogic) ZIP update and auto-install packages if requested # create WeTek Play (Amlogic) ZIP update and auto-install packages if requested
if [ "$1" = "amlpkg" ]; then if [ "$1" = "amlpkg" ]; then
echo "Creating Amlogic ZIP update package" echo "Creating Amlogic ZIP update package"
@ -426,10 +429,6 @@ fi
# copy update package to target directory # copy update package to target directory
cp sign/$IMAGE_NAME-update.zip $TARGET_IMG cp sign/$IMAGE_NAME-update.zip $TARGET_IMG
popd > /dev/null popd > /dev/null
fi
# cleanup release dir
rm -rf $RELEASE_DIR
elif [ "$1" = "noobs" ]; then elif [ "$1" = "noobs" ]; then
@ -537,6 +536,7 @@ fi
# create release tarball # create release tarball
tar cf $TARGET_IMG/${IMAGE_NAME}-$1.tar -C $TARGET ${IMAGE_NAME}-$1 tar cf $TARGET_IMG/${IMAGE_NAME}-$1.tar -C $TARGET ${IMAGE_NAME}-$1
# cleanup release dir # cleanup noobs dir
rm -rf $RELEASE_DIR rm -rf $RELEASE_DIR
fi fi
fi