From f042eb27bfc08a0f91f26ee5fb6ab7440278934f Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sat, 21 Dec 2013 19:40:08 +0100 Subject: Replicant OTA package fine tuning Signed-off-by: Paul Kocialkowski --- core/Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/core/Makefile b/core/Makefile index 400b4e0..775365b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1316,12 +1316,6 @@ else OTA_FROM_TARGET_SCRIPT := $(TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT) endif -ifneq ($(CM_BUILD),) - $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := true -else - $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false -endif - ifeq ($(TARGET_OTA_ASSERT_DEVICE),) $(INTERNAL_OTA_PACKAGE_TARGET): override_device := auto else @@ -1334,11 +1328,10 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(OTA_FROM_TARGET_SCRIPT) -v \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ - --backup=$(backuptool) \ --override_device=$(override_device) \ $(BUILT_TARGET_FILES_PACKAGE) $@ -CM_TARGET_PACKAGE := $(PRODUCT_OUT)/cm-$(CM_VERSION).zip +REPLICANT_TARGET_PACKAGE := $(PRODUCT_OUT)/$(REPLICANT_VERSION)-$(CM_BUILD).zip .PHONY: otapackage bacon otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) @@ -1346,9 +1339,8 @@ bacon: otapackage ifneq ($(TARGET_CUSTOM_RELEASETOOL),) $(error TARGET_CUSTOM_RELEASETOOL is deprecated) endif - $(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(CM_TARGET_PACKAGE) - $(hide) $(MD5SUM) $(CM_TARGET_PACKAGE) > $(CM_TARGET_PACKAGE).md5sum - @echo -e ${CL_CYN}"Package Complete: $(CM_TARGET_PACKAGE)"${CL_RST} + $(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(REPLICANT_TARGET_PACKAGE) + @echo -e ${CL_CYN}"Package Complete: $(REPLICANT_TARGET_PACKAGE)"${CL_RST} # ----------------------------------------------------------------- # The update package -- cgit v1.1