Merge pull request #311 from lrusak/noobs

scripts/image: make the images as well when running make noobs
This commit is contained in:
MilhouseVH 2016-05-20 21:26:15 +01:00
commit e533f15171

View File

@ -261,7 +261,7 @@ fi
# set permissions
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"
@ -346,7 +346,7 @@ fi
tar cf $TARGET_IMG/$IMAGE_NAME.tar -C target $IMAGE_NAME
# 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)
if [ -z "$KERNEL_NAME" ] ; then
KERNEL_NAME="KERNEL"
@ -434,10 +434,6 @@ fi
# copy update package to target directory
cp sign/$IMAGE_NAME-update.zip $TARGET_IMG
popd > /dev/null
fi
# cleanup release dir
rm -rf $RELEASE_DIR
elif [ "$1" = "noobs" ]; then
@ -544,7 +540,7 @@ fi
# create release tarball
tar cf $TARGET_IMG/${IMAGE_NAME}-$1.tar -C $TARGET ${IMAGE_NAME}-$1
fi
# cleanup release dir
rm -rf $RELEASE_DIR
fi