Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec35a1ba authored by Jef Oliver's avatar Jef Oliver
Browse files

Merge 'ics' HEAD

parents 4b625510 05755de0

core/tasks/kernel.mk

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ KERNEL_CONFIG := $(KERNEL_OUT)/.config 
ifeq ($(BOARD_USES_UBOOT),true)

	TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/uImage

	TARGET_PREBUILT_INT_KERNEL_TYPE := uImage

else ifeq ($(BOARD_USES_UNCOMPRESSED_BOOT),true)

	TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/Image

	TARGET_PREBUILT_INT_KERNEL_TYPE := Image

else

	TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/zImage

	TARGET_PREBUILT_INT_KERNEL_TYPE := zImage

tools/device/makerecoveries.sh

+11 −5
Original line number Diff line number Diff line 
if [ -z "$1" ]

then

    echo "Please provide a lunch option."

    return

    return 1

fi



PRODUCTS=$1
@@ -22,7 +22,7 @@ then 
fi



function mcpguard () {

    if [ -z $NO_UPLOAD ]

    if [ -z "$NO_UPLOAD" ]

    then

        mcp $1 $2

        md5sum $1 > $1.md5sum.txt
@@ -42,7 +42,13 @@ echo Recovery Version: $RELEASE_VERSION 
for lunchoption in $PRODUCTS

do

    lunch $lunchoption

    if [ -z $NO_CLEAN ]

    RESULT=$?

    if [ "$RESULT" != "0" ]

    then

        echo build error!

        return 1

    fi

    if [ -z "$NO_CLEAN" ]

    then

        rm -rf $OUT/obj/EXECUTABLES/recovery_intermediates

        rm -rf $OUT/recovery*
@@ -52,10 +58,10 @@ do 
    PRODUCT_NAME=$(basename $OUT)

    make -j16 recoveryzip

    RESULT=$?

    if [ $RESULT != "0" ]

    if [ "$RESULT" != "0" ]

    then

        echo build error!

        break

        return 1

    fi

    mcpguard $OUT/recovery.img recoveries/recovery-clockwork-$RELEASE_VERSION-$DEVICE_NAME.img

    mcpguard $OUT/utilities/update.zip recoveries/recovery-clockwork-$RELEASE_VERSION-$DEVICE_NAME.zip